More tweaks of the comments