Bug fixes, tried with simple heurestict for estimation, seems to be slightly
Merge conflicts fixed