Address first round of feedback.