Fixes #39 and cleans up estimate assertions