more edits and additions