Improved debug logging
Even more debug output