Changed hyphens in filenames to underscore. Fixed some 'fnd' issues.