improve overall logging