More clean up, added sub class water, fixed some bugs