Upgraded the saveGameState + some comments