More doc updates required by #1136, plus a couple of additional minor

tweaks and fixes.