Changes.
More comments to paddingControl, plus fix.