Adding some to xml file cleaning up other places