some fixes
some fixes .xml