Some code fixed and harmonized, still one TODO to resolve. Have to create an XML creator from dicts.