speed improvements
xml improvements