Fix a bunch of typos, improve markup, make wording more uniform, rearrange
some material.  No substantive changes.