Further tweaking of comments