Various tweaks, working on extended player data