fixes of comments round 1