improve logging
improve logging