Fixed up some game logic and some other stuff I can't remember