Fixing Room Again
Fixing stupid bugs in Room