Enh & fix rooms
Enh: adminx