some general edits