bug fixes drag-drop, added drag-drop features