Implemented most of the feedback resulting from the first session