improvements to exporter