Fix a counter reference
Fix a function call
Add idifference-style report for each pair
Improve error reporting