Minor updates & bug fixes.

Allow for output to file (for single entities)
Update Excel import to be multi-threaded safe.