Fixed getPlayer() which cascaded to fix many other things.
Merge branch 'Josiah'