logging improvemnets