More comments tweaks