- improve logging