More processing of the XML, including new way to handle image filenames.