Fixed up some room issues (being stuck)