more logging improvmeents