Fixes to room and more minor changes