Updates for first round of comments.