Fixed an error in xml and change xml parsing to be less verbose.