Misc Changes

Saving at the end of class.