Numerous fixes to formatting.
Numerous fixes