Still needs checking. @jwillis, can you check whether the number of neighbours is sensible with this version ?
The definition of kernels is still not completely optimal so minor changes may appear at a later stage in the project when nothing more urgent needs attention.