More kingdom join/leave changes