More retry logic.
Properly handle UCSF record merging. And cleaned up output of incremental runs.