Fixed some bugs I think I see