First set of changes to make the game more playable