Added pipes, fixed layering issues 1.2.5