Bug fixes (game state not changing)