Update to player behavior.
Merge branch 'master' of https://github.com/NULLSTATE/WIP