Got the speed more correct.
Merge pull request #165 from hawesie/hydro-devel

Got the speed more correct for simple estimate