Mods based on rpu 02b

Bock, Andyrequested to merge
Bock into master

Fixing terminal outlets with no catchment (this may be the only one!)

Merge request reports