improve logging, comments