logging improvements phase-1