FIXED another two HUGE BUGS