Finish work on the tap (non-formula)

[peter-bread]

These should be the only changes required to have this tap fully operational.

(This excludes any changes to formulae)