Improve logging w/ verbose logging enabled