improved xml handling

4 files changed