Did a little more.

Fixes in various places - mostly, in the discrete aquifers class, to add
compatibility with more areas.