Minor adjustments making generated document closer to Office 2010.
Improve support for images add image and chart captions.