Added a few more logging statements