Estimator is a bit improved, several bugs fixed, files are added to repository