Verision1.1 bugs fixes

--really shouldn't get ahead of myself version