Neatening and minor fixes to PlayerChallenges