room bug fixes