Provenance tested

Fixed a few bugs, changed some parameters, and restructured the
configuration files to make it easier to change or find errors.