fix and re-add anchors.
6 files changed