Integrated first round of comments