Improve logging

Ah, great!