Improve logging

Sure, we'll do it when we find the need for it.