r90: more debugging info
r91: avoid too many correction paths