Final debugging of 2.1

I'm giving the final 'spit-and-polish' to release 2.1.

What to expect in the new version: