Update debug code, add more reports.