* cleanup

* cleanup

* diagnostics

* cleanup diagnostics

* even cleaner diagnostics

* cleanup diagnostics

* default tuning

* adjust tuning, more logging

* add test, fix whitespace