Add rs.finish() to be sure

Update the distance estimator to walk back more precisely