added a bunch of stuff
Merge branch 'players'