Added onoccupied rooms
Cosmetic improvements