OnDragLeave and some minor improvements