Bring into line with local copy.  Several hydrotools functions fixed.