misc tweaks, spacing