more edits and updates