more xml parsing updates