More global player references removed; passing as param where possible. Pulled player into Game.player.