...and add some more debug output