more tweaks to exporter and adding order control