Minor fixes, work on next draft of main room interface