Fix logging
Improve logging
oups