Added TOC, some formatting