Running the waterline into the shop, plus a few miscellaneous things