Updated toc and anchors