Fixes in analysis, made callbacks better.