Updated excel export code, and some common things in ImportFile