Bug Fixes

This includes the onPlayerJoin bug.