various game state fixes