more edits and formatting