cleanups regarding dragging, zastap excercise