aaactually fixed all the drag-and-drop bugs