More progress on XML export/import