WIP, redoing structure
C-c: nocache is honored in 4.0
Formatting
Redo heading structure a bit
Adhere to style manual
TOC looks OK in HTML and latex now