Remove some debugging code.  Add more debug info.