Civet collector
flake8 fixes
Logging and updates