Comments tweaks