My own edits to Section 6.4.5
My own edits to Section 6.5