ENH: detect some convergance problems and simplify code
ENH: add regression plots
CHG: simplify code