Minor overhaul- spike detect before motion-correct