multiple room support, cleanups