Merging new stuff from the master into this FB

There was a new diagram in the Master branch and a couple of other
tweaks that I moved over into this Feature Branch in preparation to
merge it back into the Master.