Some more comment improvements