Improve logging BIG TIME