Confirm no copy/paste errors, and clean up minor typos.