fix after merge

fix after merge
real values for CostModelMeasurements

added real values to cost model and real formula, and cleaned up
CostEstimator
JoinAndIndexPicker

properly building inner and outer ExpressionNode lists, fixing up calls
to estimator, still not completely working, more tweaking to be done