Cleaning up text, fiddling with chapter numbers and title style
Make notes and exercises in toc point to correct place
Still trying to get the appendix right