Corrections to settings and tox conf.
Corrected upgrade template's handling of unenforced payments.