diff --git a/src/items/xqitem.cpp b/src/items/xqitem.cpp
index 6642c3f..f2e865d 100644
--- a/src/items/xqitem.cpp
+++ b/src/items/xqitem.cpp
@@ -138,7 +138,7 @@ XQItem::XQItem( XQItemType* itemType )
 //! konstruiert ein daten-item mit zeiger auf 'unser' attribut
 //! im übergeordneten content-node.
 
-XQItem::XQItem(XQItemType* itemType, const QString *content )
+XQItem::XQItem(XQItemType* itemType, const QString* content )
   : XQItem{ itemType }
 {
   // hier setzen wir direkt ohne umwege den string pointer
@@ -622,12 +622,12 @@ void XQItem::setData(const QVariant& value, int role )
       // fallback: wenns keinen content node gibt, dann nehmen wir
       // das standardverfahren.
       if( !hasContentPtr() )
-        return QStandardItem::setData( newValue, XQItem::ContentRole );
+        return QStandardItem::setData( newValue, Qt::DisplayRole );
 
       // wir nehmen den string pointer
-      const QString* contentPtr = QStandardItem::data( XQItem::ContentRole ).value<const QString*>();
-      //Q_ASSERT(contentPtr);
-      *contentPtr = newValue.toString();
+      const QString* constContentPtr = QStandardItem::data( XQItem::ContentRole ).value<const QString*>();
+      // aua, aua, muss aber sein, weil sonst alle anderen consts nicht durchgehalten werden könnten
+      *const_cast<QString*>(constContentPtr) = newValue.toString();
       return;
     }
 
diff --git a/src/items/xqitemfactory.h b/src/items/xqitemfactory.h
index eb23d2c..cf51a4e 100644
--- a/src/items/xqitemfactory.h
+++ b/src/items/xqitemfactory.h
@@ -28,23 +28,14 @@ class XQItemFactory : public xsingleton<XQItemFactory>
 
 public:
 
-
-
   void initItemFactory(const QString& modelSheetFileName );
 
   XQNodePtr  findModelSheet( const QString& modelName ) const;
 
-  XQItemList makeRow( const XQNodePtr& sheetNode, const XQNodePtr& contentNode );
+  XQItemList  makeRow( const XQNodePtr& sheetNode, const XQNodePtr& contentNode );
+  XQItem*     makeSingleItem( const XQNodePtr& sheetNode, const QString& caption );
 
-  //XQItemList makeEmptyRow( const XQNodePtr& contentNode, const XQNodePtr& sheetNode );
-
-  XQItem* makeSingleItem( const XQNodePtr& sheetNode, const QString& caption );
-
-
-  // wozu ist das gut?
-  //XQItemList createGenericRow( const XQNodePtr& contentNode, const XQNodePtr& sheetNode );
-
-  void setItemDataFromString( XQItem& item, const QString& roleKey, const QString& source ) const;
+  void        setItemDataFromString( XQItem& item, const QString& roleKey, const QString& source ) const;
 
   XQItemType* makeItemType(const XQNodePtr& sheetEntry );
   XQItemType* findItemTypeTemplate(const QString& key ) const;
diff --git a/xml/saved_testfile.xtr b/xml/saved_testfile.xtr
index ac8e3ef..b21fb3f 100644
--- a/xml/saved_testfile.xtr
+++ b/xml/saved_testfile.xtr
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Components>
     <Panel FriendlyName="@PanelName" Height="2,70" Manufacturer="JA Solar 1 XX" MaxAmpere="11" MaxVolt="67" PanelID="#1 JA 01" PanelName="JA 01 Solar T62B" WattPeak="620" Weight="12" Width="1,10"/>
-    <Panel FriendlyName="@PanelName" Height="1,70" Manufacturer="JA Solar 2" MaxAmpere="11" MaxVolt="42" PanelID="#2 JA 02" PanelName="JA 02 Solar X58C" WattPeak="440" Weight="12" Width="1,10"/>
+    <Panel FriendlyName="@PanelName" Height="1,70" Manufacturer="JA Solar 2" MaxAmpere="11" MaxVolt="42" PanelID="#2 JA 02" PanelName="maa" WattPeak="440" Weight="12" Width="1,10"/>
     <Panel FriendlyName="@PanelName" Height="2,70" Manufacturer="JA Solar 3" MaxAmpere="11" MaxVolt="67" PanelID="#3 JA 03" PanelName="JA 03 Solar T62B" WattPeak="620" Weight="12" Width="1,10"/>
-    <Panel FriendlyName="@PanelName" Height="1,70" Manufacturer="JA Solar 4" MaxAmpere="11" MaxVolt="42" PanelID="#4 JA 04" PanelName="JA 04 Solar X58C" WattPeak="440" Weight="12" Width="1,10"/>
+    <Panel FriendlyName="@PanelName" Height="1,70" Manufacturer="JA Solar 4" MaxAmpere="11" MaxVolt="42" PanelID="#4 JA 04" PanelName="moo" WattPeak="440" Weight="12" Width="1,10"/>
     <Panel FriendlyName="@PanelName" Height="1,70" Manufacturer="JA Solar 5" MaxAmpere="11" MaxVolt="42" PanelID="#5 JA 05" PanelName="JA 05 Solar X58C" WattPeak="440" Weight="12" Width="1,10"/>
     <Panel FriendlyName="@PanelName" Height="1,70" Manufacturer="JA Solar 6" MaxAmpere="11" MaxVolt="42" PanelID="#6 JA 06" PanelName="JA 06 Solar X58C" WattPeak="440" Weight="12" Width="1,10"/>
     <Inverter FriendlyName="@InverterName" InverterID="#1 HM600 01" InverterName="01 HM600 S2 TMax" Manufacturer="HoyMiles" MaxPowerInput="2000" MaxPowerInputChoice="2000;4000;6000" MaxPowerOutput="600" NumStrings="2" Weight="28"/>