Fixed some of the bugs I made