Adding some more fixes for game logic.