some spacing and minor adjustments