a few logging improvements