Add some more debug/printing for cleaner looks