further improvements to game mode seperation