Fixed merge error, added a bit more usability to player management