More pipework and LANDSCAPE FOR GLASS
Merge remote-tracking branch 'cove/master'
Fixed some pipes