[UPDATE] Improve debug output.