- joined duplicated code, made normal-fit error-calculation configurable
- fixed stride-access