More comment improvements