Rework some paragraphs and references.