Some more tuning of the estimation graph. Still needs a lot of work