many changes, some related to drag and drop