Fix bugs with distinct estimation
Refactor abort interface a little