various comment improvements