Add player:joined event
Fix player tracking
Another quick tweak