More comments adjustments