Feature/logging improvements

@anodelman ping