Some minor tweaks to secure vars
Add anchors for <h2> tags in the documentation body