fixed up some of the classes