adding some anchors, reordering, fixing some typos