Misc spacing and formatting fixes.