Edits & fix typos