Spacing and fixes