added more logging
Merge branch 'chore/add_logging'