Fixes from contributed document

First set of fixes for weirdnesses in document contributed in the list. Tests will be added when I get permission to cut and paste from his document.