Refactoring Game.
Fixed a few "TODO" items, including changes needed becaue of Itchy refactoring.