comment improvements