More gameState improvements