watershed_mod looks like aleks's type-2 modified watershed now.  minor comment/type improvements for watershed_util.