Re-added some things.
Lots of changes in spacing and some content.

This commit finishes some of Doug McIlroy suggestions.