Fixing the Piping Overhaul

- Fixed most (hopefully all, but I might have forgotten a pipe or two) of the errors clearly outlined on this map image generated by Duny : http://puu.sh/aDRfL/366f879548.png