simplify estimator
fix random generation of estimators