logging config, refactoring, more handler calls