Spacing, minor tweaks