UT for XML parser; some updated stuff for XML.