Distortion correction close to production quality (tests are still
missing)