diff --git a/GUI/coregui/Models/MaterialModel.cpp b/GUI/coregui/Models/MaterialModel.cpp
index e63579412f1e97ecea99c522e5aae6962024ee4b..33fc94c03194f98eee14bb482357e8b24dd69528 100644
--- a/GUI/coregui/Models/MaterialModel.cpp
+++ b/GUI/coregui/Models/MaterialModel.cpp
@@ -61,19 +61,6 @@ MaterialItem *MaterialModel::getMaterial(const MaterialProperty &property)
     return 0;
 }
 
-//MaterialProperty MaterialModel::getMaterialPropertyForName(const QString &name)
-//{
-//    QModelIndex parentIndex;
-//    for( int i_row = 0; i_row < rowCount( parentIndex ); ++i_row) {
-//         QModelIndex itemIndex = index( i_row, 0, parentIndex );
-
-//         if (MaterialItem *material = dynamic_cast<MaterialItem *>(itemForIndex(itemIndex))){
-//             if(material->getIdentifier() == property.getIdentifier()) return material;
-//         }
-//    }
-//    return 0;
-
-//}
 
 
 
diff --git a/GUI/coregui/Views/Components/MaterialEditor/MaterialUtils.cpp b/GUI/coregui/Views/Components/MaterialEditor/MaterialUtils.cpp
index e7052d4079b05b7fefa99a9ebd0b76a6e8c2e9a6..9dcba419ce5ca25645815cc1ae7256e4fd33d29a 100644
--- a/GUI/coregui/Views/Components/MaterialEditor/MaterialUtils.cpp
+++ b/GUI/coregui/Views/Components/MaterialEditor/MaterialUtils.cpp
@@ -28,10 +28,10 @@ QColor MaterialUtils::suggestMaterialColor(const QString &name)
 }
 
 
-MaterialProperty MaterialUtils::getMaterialProperty(MaterialItem *material)
-{
-    return MaterialProperty(material->getIdentifier());
-}
+//MaterialProperty MaterialUtils::getMaterialProperty(MaterialItem *material)
+//{
+//    return MaterialProperty(material->getIdentifier());
+//}
 
 
 MaterialProperty MaterialUtils::getDefaultMaterialProperty()
diff --git a/GUI/coregui/Views/Components/MaterialEditor/MaterialUtils.h b/GUI/coregui/Views/Components/MaterialEditor/MaterialUtils.h
index 59440227a5ab0b8235b10d15b044ccfe848e6883..c06df5b1d84c0b1c5f383c11d7299472d5859f21 100644
--- a/GUI/coregui/Views/Components/MaterialEditor/MaterialUtils.h
+++ b/GUI/coregui/Views/Components/MaterialEditor/MaterialUtils.h
@@ -13,7 +13,7 @@ namespace MaterialUtils
 {
 
 QColor suggestMaterialColor(const QString &name);
-MaterialProperty getMaterialProperty(MaterialItem *material);
+//MaterialProperty getMaterialProperty(MaterialItem *material);
 MaterialProperty getDefaultMaterialProperty();
 ColorProperty suggestMaterialColorProperty(const QString &name);
 
diff --git a/GUI/coregui/Views/Components/SampleDesigner/PropertyBrowserUtils.cpp b/GUI/coregui/Views/Components/SampleDesigner/PropertyBrowserUtils.cpp
index 8e692e1b4ba23871ca1f2d4a1b056542b068af42..902cebb40153726439797b5f92ff1e13383dc65a 100644
--- a/GUI/coregui/Views/Components/SampleDesigner/PropertyBrowserUtils.cpp
+++ b/GUI/coregui/Views/Components/SampleDesigner/PropertyBrowserUtils.cpp
@@ -45,6 +45,11 @@ MaterialPropertyEdit::MaterialPropertyEdit(QWidget *parent)
     connect(button, SIGNAL(clicked()), this, SLOT(buttonClicked()));
 }
 
+MaterialPropertyEdit::~MaterialPropertyEdit()
+{
+    qDebug() << "MaterialPropertyEdit::~MaterialPropertyEdit()";
+}
+
 
 void MaterialPropertyEdit::buttonClicked()
 {
@@ -54,6 +59,7 @@ void MaterialPropertyEdit::buttonClicked()
     //if(mat != m_materialProperty && mat.isDefined() ) {
     if(mat.isDefined() ) {
         setMaterialProperty(mat);
+        qDebug() << "MaterialPropertyEdit::buttonClicked() -> emitting signal";
         emit materialPropertyChanged(m_materialProperty);
     }
 }
diff --git a/GUI/coregui/Views/Components/SampleDesigner/PropertyBrowserUtils.h b/GUI/coregui/Views/Components/SampleDesigner/PropertyBrowserUtils.h
index e871c5578ef055acb4fa131eef624e2bcdc83c24..8418f039bc32676570b7280c5f3eab2075518e6e 100644
--- a/GUI/coregui/Views/Components/SampleDesigner/PropertyBrowserUtils.h
+++ b/GUI/coregui/Views/Components/SampleDesigner/PropertyBrowserUtils.h
@@ -21,6 +21,7 @@ class MaterialPropertyEdit : public QWidget
     Q_OBJECT
 public:
     MaterialPropertyEdit(QWidget *parent = 0);
+    ~MaterialPropertyEdit();
 
     void setMaterialProperty(const MaterialProperty &materialProperty);
     MaterialProperty getMaterialProperty() const {return m_materialProperty; }
diff --git a/GUI/coregui/Views/Components/SampleDesigner/PropertyVariantFactory.cpp b/GUI/coregui/Views/Components/SampleDesigner/PropertyVariantFactory.cpp
index 90b9533369cd2d333d4fb0ddfabd51cfc401fd9e..72bd9f8e0bee42564e7ac64164813d8b4a6b047a 100644
--- a/GUI/coregui/Views/Components/SampleDesigner/PropertyVariantFactory.cpp
+++ b/GUI/coregui/Views/Components/SampleDesigner/PropertyVariantFactory.cpp
@@ -1,6 +1,7 @@
 #include "PropertyVariantFactory.h"
 #include "PropertyVariantManager.h"
 #include "PropertyBrowserUtils.h"
+#include <QDebug>
 
 
 PropertyVariantFactory::~PropertyVariantFactory()
@@ -214,6 +215,7 @@ void PropertyVariantFactory::slotPropertyChanged(QtProperty *property,
 
 void PropertyVariantFactory::slotSetValue(const MaterialProperty &value)
 {
+    qDebug() << "PropertyVariantFactory::slotSetValue(const MaterialProperty &value)";
     QObject *object = sender();
     QMap<MaterialPropertyEdit *, QtProperty *>::ConstIterator itEditor =
                 m_material_editor_to_property.constBegin();
diff --git a/GUI/coregui/Views/Components/SampleDesigner/SamplePropertyEditor.cpp b/GUI/coregui/Views/Components/SampleDesigner/SamplePropertyEditor.cpp
index 7b63a505c740df758d98e5c6277ba4d7ea561fb3..b6e983abaeadff30e13fe7b3406e5c967bbbc1d4 100644
--- a/GUI/coregui/Views/Components/SampleDesigner/SamplePropertyEditor.cpp
+++ b/GUI/coregui/Views/Components/SampleDesigner/SamplePropertyEditor.cpp
@@ -71,7 +71,7 @@ void SamplePropertyEditor::selectionChanged(const QItemSelection & selected,
 void SamplePropertyEditor::slotValueChanged(QtProperty *property,
                                             const QVariant &value)
 {
-    qDebug() << "SamplePropertyEditor::slotValueChanged()";
+    qDebug() << "SamplePropertyEditor::slotValueChanged()" << value;
     if (!m_property_to_item_index_pair.contains(property))
         return;
 
@@ -84,6 +84,7 @@ void SamplePropertyEditor::slotValueChanged(QtProperty *property,
         if (item_index_pair.m_index > prop_list.length()) {
             return;
         }
+        qDebug() << "setting ..." << prop_list[item_index_pair.m_index].constData();
         item_index_pair.m_item->setProperty(
             prop_list[item_index_pair.m_index].constData(), value);
     }