incorporated edits and changes after internal EFF review
fix merge conflict because of my prior fix to links in the middle of a proposed EFF change