Modify TODO, minor bug fixes in room class.