Add more debug info to the output
Merge branch 'calveto-debug-info'