Reset player by copying from playerSettings.

Also did a little bit of reorganisation on the code, while I was at it.