Fixed some game logic