more logging imporvments