Switch manual anchors to new format. Fix some linking and markup errors.