Light re-org, poor attempt at end-game
Make the game not freak out at 'game-over'