more edits, mostly small