added rooms, bugfixes