more edits, formatting