Tidy up adding a player a little. (So much of this code needs tidying, but that would make it hard to pull latest official)