Tidy up previous commit - re-add some logging, fix up comment.