Add all game states & fix issue with StateManager.