answers almost final
Merge pull request #137 from JasonBenn/cleanup_player

answers almost final