Edits and typo's