Add TOC and fix headings