Reorder paragraphs, fix some typos