More comment adjustments