Add content anchors and fix some oversights