Fixed and verified tree.  Cleaned out debug code.