fix output of mover
put row move markers in saner locations
simplify highlighter diff parsing