Misc map fixes, moved some pipes out of reinforced walls