Fixes cell calculations to be a bit(lot) more accurate