more comment improvements