Added the Room object and more bugfixes.