Added more fields to Player.
Fixing merge conflicts, not sure if correct.