Spacing fix and a few more adjustments