Fixed comments, round 1.