Add ''.strip() to 'FS Curv' testing on filenames.
Minor logic changes.