fixed mouseEnterLeave + improved dragging method