More changes...

- trying to get xml autoformatting to work.