Improve logging; improve user interaction