More copy-edit, cleaning
Even more copyedits