Refactor

* correct method name
* extract method
* improve logging
* add more settings
* adapt flux