Add room order and bug fixes