logging update
logger client fixes
Refactor