More Work on pipes, and updated to 1.6.4