partitioner/collision improvements, saving