fix some cross-references and markup