Rewritten xml parsing using XPath

Correctly parses child nodes
Fixed merge conflicts