Padding and stacking improvements.