Add some fixing and formatting.