Add some clarifications to section 8.4.

Tighten up some headings by moving content into an existing Table.

Fix some tags.

To be followed by a white space fix.