Naming fixes
Added estimation to main
Fixed estimation and estimation reset