Improve debug output
Add a bunch more debug output