Changes to a bunch of stuff by me and matt. Mainly the player. Add a settings handler