fixed some issues related to game state

fixed some issues related to game state