Some comments tweaks