&player; should now refer to the player
Bugfixes