Improve logging
oups