Lots of tweaks, XML output