last of the formatting fixups.