225imgfix

More bugs were being caused by whitespaces in filenames.  More fixes added.