diff --git a/src/plugins/dataobject/differentiation/differentiationconfig.ui b/src/plugins/dataobject/differentiation/differentiationconfig.ui
diff --git a/src/plugins/dataobject/differentiation/kstplugin_differentiation.desktop b/src/plugins/dataobject/differentiation/kstplugin_differentiation.desktop
diff --git a/src/plugins/dataobject/shift/shift.cpp b/src/plugins/dataobject/shift/shift.cpp
@@ -46,6 +46,18 @@ class ConfigWidgetShiftPlugin : public Kst::DataObjectConfigWidget, public Ui_Sh
       }
     }
 
+    void setVectorX(Kst::VectorPtr vector) {
+      setSelectedVector(vector);
+    }
+
+    void setVectorY(Kst::VectorPtr vector) {
+      setSelectedVector(vector);
+    }
+
+    void setVectorsLocked(bool locked = true) {
+      _vector->setEnabled(!locked);
+    }
+
     Kst::VectorPtr selectedVector() { return _vector->selectedVector(); };
     void setSelectedVector(Kst::VectorPtr vector) { return _vector->setSelectedVector(vector); };
 
@@ -122,6 +134,15 @@ QString ShiftSource::_automaticDescriptiveName() const {
   return QString("Shift Plugin Object");
 }
 
+QString ShiftSource::descriptionTip() const {
+  QString tip;
+
+  tip = i18n("Shift: %1\n  dX: %2\n").arg(Name()).arg(scalar()->value());
+
+  tip += i18n("\nInput: %1").arg(vector()->descriptionTip());
+  return tip;
+}
+
 
 void ShiftSource::change(Kst::DataObjectConfigWidget *configWidget) {
   if (ConfigWidgetShiftPlugin* config = static_cast<ConfigWidgetShiftPlugin*>(configWidget)) {

diff --git a/src/plugins/dataobject/shift/shift.h b/src/plugins/dataobject/shift/shift.h
@@ -26,6 +26,8 @@ class ShiftSource : public Kst::BasicPlugin {
   public:
     virtual QString _automaticDescriptiveName() const;
 
+    virtual QString descriptionTip() const;
+
     Kst::VectorPtr vector() const;
     Kst::ScalarPtr scalar() const;
 

diff --git a/src/plugins/filters/differentiation/differentiation.cpp b/src/plugins/filters/differentiation/differentiation.cpp
@@ -17,7 +17,7 @@
 #include "objectstore.h"
 #include "ui_differentiationconfig.h"
 
-static const QString& VECTOR_IN = "Y Vector";
+static const QString& VECTOR_IN = "Vector In";
 static const QString& SCALAR_IN = "Scale Scalar";
 static const QString& VECTOR_OUT = "dY/dX";
 
@@ -128,7 +128,11 @@ DifferentiationSource::~DifferentiationSource() {
 
 
 QString DifferentiationSource::_automaticDescriptiveName() const {
-  return QString(vector()->descriptiveName() + " Derivative");
+    if (vector()) {
+      return QString(vector()->descriptiveName() + " Derivative");
+    } else {
+      return QString("Derivative");
+    }
 }
 
 QString DifferentiationSource::descriptionTip() const {