as #67, but minor fix to outlier conditional

+ corrects minor error in how x-pixel errors were handled.  Suggest merge with strategy=theirs.