Minor adjustments, and spacing changes