Improving river simulation

I'm continuing with the process of converting the old region-drawing functions into the new globular context, and refactoring and improving ...