Further comment adjustments