Update version references and a couple minor edits
One more reference substitution