Adding some more logging. Ref #36.