A bit more of comment fixing.