more edits, typos