#150 improvements to exporter