commiting roomcontroller and some fixes