Updated to reading our xml file format
Tweaks