Fix game state update, still incomplete