Move around some paragraphs and other changes