now I even get the filenames right.