now joining rooms again (ie, fixed everything that was broken by the reorg)