Various changes to cell creation and neighbrhood computations