minor fixes + room, zone tags