Improved game flow and game state restoring