Bugfix issues #34 + room creation