Make the xml branch work with the last commits

I've fetched and merged your xml branch into my Xenopathic-xml branch and this is the pull request for it.