Fixed some bugs I dunno