fix some cross-references
fix markup
Merge pull request #970 from tshepang/diff

fix some cross-references and markup