Track player's gamemode
Minor fixes