Added some more logging statements