Many improvement two the export process, much around encoding