small edits and changes after discussion with annie