Fixed more of the XML

#37