switching to second room
fixes
naming fixes
Merge pull request #1 from tinaun/master

updates