Made a few changes to Player and UserPlayer.