Streamline and Order Export File; Fix Minor Warnings on Import