Various formatting fixes and minor changes.