Fixed rejoining and ring stuff