Improves config, logging