Fixes issues #526 and #720

* Fixes #720
* Makes some airlock construction steps read better
* Fixes #526

I tried to delete 720 from this branch but it didn't work for some reason.