changes to bugfix based on further work in XML_Util