Fixed up some classes and their constructors