Crumble rooms working again (plus some improvements to them)