fixed exporter, probably some other stuff as well