refs issue #1: clean up debug information a bit