fixed issues related to game state

fixed issues related to game state