Rearrange and edit content, move stability up

Also changed code to update the spatial grid all at once using array
slices