Adding room emit and some callback cleanups