Map fixes

Fixing my own fuckups and some problems with the pipes at the second customs office.