Many bug fixes on locking/unlocking adding/removing players