Fixed flaw where gridcells were moving rather than the searchers
Fixed merging conflicts