Fixed some bugs
changes to bugs in player, game
Bug fixes
Merge branch 'mwork'
Merge remote-tracking branch 'origin/lwork'