fix multiple drag

and undo all this other stuff