Maintenance Expansion Fixes

![m11](https://cloud.githubusercontent.com/assets/6830971/2929798/a6f6c85e-d78d-11e3-8ce1-35476624c6d3.png)

Some fixes to previous pull request plus a change to SW maintenance. Pipes and walls in doorways fixed.