Better handling of filenames with spaces. Not perfect yet.