more updates to xml parsing