Added some trace and debug printing.

3 files changed