Improved file matching, and Zero length files.