more edits/changes