Some bug fixing
Exporting Files improved so that they load