second pass of comments