Added TOC, anchors and updated content order