Various doc and string fixes

See commit messages for details.

backport to 2.1.x