Add table of contents
Minor cleanup