warnings cleanup && logger improvements