[skip ci] modifying xml input files, and a few other modifications to source code.