Allow for the provision of a "general" metadata file.
Fix use of MARC files.