Improve logging further
0.2.1