Setup_db amendments and main loop fix

Michal Zanderrequested to merge
mzander/clean-setup into 22-create-witness-table

Merge request reports