"Improve logging"

There is some progress. Please see also