add room names and some cleanups