Fixed more things for game state

Bug fixes