Several formatting fixes/tweaks.