Continued fixing things across various classes to make them work with our new core classes. I've also cleaned up indentation and random code snippets along the way.