formatting and other cosmetic fixes.