fixes up Object class. Cleans up some other things