Tweak Game class a bit