Various formatting fixes.