Corridor fix and main scene fix
Merged with all other stuff.