Done some additional work related to multiple file support.