more edits and notes