Edits and typo corrections