Minor tweaks for spacing and such.