Many fixes to rooms