fixes of comments round 2