Improve warping, remove trace
Improve previous/next detection