Minor tweaks + inversion of elapsedToEstimate ratio