Map fixes

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