Some testing versionization improvements
Xml stream fix. Yeeee! One trap less!
Small changes