Various edits as suggested