Added progress bar and improved file type matching