Some improvements to the game