added rooms
fixed some issues