Improving logging a little bit.