Changes from additional QA

Should be the final round of QA revisions.