more cross link cleanup and typos