more minor changes
more xml stuff