better XML
enhancements
fix sample usage