cleanup, and added code back into heading, so that we can place the anchors