Add named anchors, fix typos