implemented a more proper grid search order, final tweak pass on motion