FIXED allll of the bugs