Add some more fixing and formatting.