Fixes to handling of files with spaces in the names, better scanning, and some minor fixes.