Added more to xml parsing, restructured parse order