handle comments better