Fixed FactorExport issues. Improved Export output.