Redid dragging insertion and misc bugs