- some logging improvements and cosmetics