Minor edits and typos