Final edits, fix typos