no change - just added debug messages, and pretty-printed