second round of post release edits
Merge pull request #1043 from bradsev/post-release-edits2-acb

second round of post release edits