updates many things for second round of feedback