some more fixes
add
all kinds of logging refactorings