minor updates for exporting