add GameController._gameState, clean some stuff