broke + rebroke + fix

-- field changes being recognized properly
remove dead code
cannot change to iteration then change estimate to 0
more refactors