Improve logging (hopefully)