more xml improvements