Updated a bit more of the classes

I had some sloppy code in there that needed correcting