Fixed some issues connected with the XML

The XML parsing is now completed.