Spacing adjustments as suggested by Axel.