Fixing missed display of original filename, fixed random comma