big move forward (version upgrade everything)
xml generation cleanup