Smaller improvements
Order of the game states
Correct game state order/false merge