Fixed up game logic