adapt to new spec
added
updates
more
Add -D debug target which outputs the XML
change the order
documenation updates