An optical measurement system may improve the accuracy with which it estimates distances to surrounding objects by upgrading various aspects of its data path. Spatial resolution may be increased by subdividing histogram buckets or integration registers based on spatial location. Saturation at any point in the data path can be detected and used to stop counting photons in individual pixels, which can then be normalized after a measurement is over. Multiple peaks can be detected using recursive or iterative techniques to identify a largest remaining peak at each stage. Instead of iterating through the histogram memory multiple times, a threshold can be pre-calculated based on an estimated ambient noise level, and peaks can be detected in a single pass.