tweak/improve debug output a bit