diff --git a/make/target_system.mk b/make/target_system.mk
index c7edf351..63ef8553 100644
--- a/make/target_system.mk
+++ b/make/target_system.mk
@@ -56,6 +56,7 @@ endif
 
 ifeq ($(TARGET), LINUX-ARM)
 TOOLCHAIN_PREFIX=$(ARM_TOOLCHAIN_PREFIX)
+CFLAGS += -mcpu=arm926ej-s
 endif
 
 ifeq ($(TARGET), UCLINUX-WAGO)
diff --git a/src/iec61850/server/mms_mapping/reporting.c b/src/iec61850/server/mms_mapping/reporting.c
index e97ebc4e..7c14476f 100644
--- a/src/iec61850/server/mms_mapping/reporting.c
+++ b/src/iec61850/server/mms_mapping/reporting.c
@@ -143,6 +143,20 @@ ReportControl_unlockNotify(ReportControl* self)
 }
 
 
+static void
+purgeBuf(ReportControl* rc)
+{
+    if (DEBUG_IED_SERVER) printf("IED_SERVER: reporting.c: run purgeBuf\n");
+
+    ReportBuffer* reportBuffer = rc->reportBuffer;
+
+    reportBuffer->lastEnqueuedReport = NULL;
+    reportBuffer->oldestReport = NULL;
+    reportBuffer->nextToTransmit = NULL;
+    reportBuffer->reportsCount = 0;
+}
+
+
 static void
 deleteDataSetValuesShadowBuffer(ReportControl* self)
 {
@@ -496,6 +510,11 @@ updateReportDataset(MmsMapping* mapping, ReportControl* rc, MmsValue* newDatSet,
         if (strcmp(MmsValue_toString(newDatSet), "") == 0) {
             success = true;
             dataSetValue = NULL;
+
+            if (rc->buffered) {
+                rc->isBuffering = false;
+                purgeBuf(rc);
+            }
         }
         else
             dataSetValue = newDatSet;
@@ -670,19 +689,6 @@ refreshTriggerOptions(ReportControl* rc)
         rc->triggerOps += TRG_OPT_GI;
 }
 
-static void
-purgeBuf(ReportControl* rc)
-{
-    if (DEBUG_IED_SERVER) printf("IED_SERVER: reporting.c: run purgeBuf\n");
-
-    ReportBuffer* reportBuffer = rc->reportBuffer;
-
-    reportBuffer->lastEnqueuedReport = NULL;
-    reportBuffer->oldestReport = NULL;
-    reportBuffer->nextToTransmit = NULL;
-    reportBuffer->reportsCount = 0;
-}
-
 static void
 refreshIntegrityPeriod(ReportControl* rc)
 {
@@ -1730,7 +1736,7 @@ enqueueReport(ReportControl* reportControl, bool isIntegrity, bool isGI, uint64_
         if (DEBUG_IED_SERVER)
             printf("IED_SERVER: enqueueReport: report buffer too small for report entry! Skip event!\n");
 
-        return;
+        goto exit_function;
     }
 
     if (isGI) removeAllGIReportsFromReportBuffer(buffer);
@@ -1738,7 +1744,7 @@ enqueueReport(ReportControl* reportControl, bool isIntegrity, bool isGI, uint64_
     uint8_t* entryBufPos = NULL;
     uint8_t* entryStartPos;
 
-    //if (DEBUG_IED_SERVER)
+    if (DEBUG_IED_SERVER)
         printf("IED_SERVER: number of buffered reports:%i\n", buffer->reportsCount);
 
     if (buffer->lastEnqueuedReport == NULL) { /* buffer is empty - we start at the beginning of the memory block */
@@ -2007,7 +2013,10 @@ enqueueReport(ReportControl* reportControl, bool isIntegrity, bool isGI, uint64_
         buffer->oldestReport = buffer->lastEnqueuedReport;
 
     reportControl->lastEntryId = entryId;
-}
+
+exit_function:
+    return;
+} /* enqueuReport() */
 
 static void
 sendNextReportEntry(ReportControl* self)
@@ -2029,11 +2038,11 @@ sendNextReportEntry(ReportControl* self)
 
     ReportBufferEntry* report = self->reportBuffer->nextToTransmit;
 
-//#if (DEBUG_IED_SERVER == 1)
+#if (DEBUG_IED_SERVER == 1)
     printf("IED_SERVER: SEND NEXT REPORT: ");
-    //printReportId(report);
+    printReportId(report);
     printf(" size: %i\n", report->entryLength);
-//#endif
+#endif
 
     MmsValue* entryIdValue = MmsValue_getElement(self->rcbValues, 11);
     MmsValue_setOctetString(entryIdValue, (uint8_t*) report->entryId, 8);
@@ -2356,6 +2365,7 @@ cleanup_and_return:
 
     if (localStorage != NULL)
         GLOBAL_FREEMEM(localStorage);
+
 }
 
 void
@@ -2378,11 +2388,13 @@ Reporting_activateBufferedReports(MmsMapping* self)
 static void
 processEventsForReport(ReportControl* rc, uint64_t currentTimeInMs)
 {
+
+
     if ((rc->enabled) || (rc->isBuffering)) {
 
         if (rc->triggerOps & TRG_OPT_GI) {
             if (rc->gi) {
-                printf("rc->gi\n");
+
                 /* send current events in event buffer before GI report */
                 if (rc->triggered) {
                     if (rc->buffered)
@@ -2408,12 +2420,9 @@ processEventsForReport(ReportControl* rc, uint64_t currentTimeInMs)
 
             if (rc->intgPd > 0) {
                 if (currentTimeInMs >= rc->nextIntgReportTime) {
-                    printf("integrity\n");
+
                     /* send current events in event buffer before integrity report */
                     if (rc->triggered) {
-
-                        printf("intg check triggered\n");
-
                         if (rc->buffered)
                             enqueueReport(rc, false, false, currentTimeInMs);
                         else
@@ -2437,8 +2446,6 @@ processEventsForReport(ReportControl* rc, uint64_t currentTimeInMs)
         if (rc->triggered) {
             if (currentTimeInMs >= rc->reportTime) {
 
-                printf("triggered\n");
-
                 if (rc->buffered)
                     enqueueReport(rc, false, false, currentTimeInMs);
                 else
@@ -2450,8 +2457,9 @@ processEventsForReport(ReportControl* rc, uint64_t currentTimeInMs)
 
         if (rc->buffered && rc->enabled)
             sendNextReportEntry(rc);
-
     }
+
+
 }
 
 void
diff --git a/src/mms/iso_mms/common/mms_value.c b/src/mms/iso_mms/common/mms_value.c
index ebfa924f..b096c04b 100644
--- a/src/mms/iso_mms/common/mms_value.c
+++ b/src/mms/iso_mms/common/mms_value.c
@@ -994,6 +994,8 @@ MmsValue_cloneToBuffer(const MmsValue* self, uint8_t* destinationAddress)
             int i;
             for (i = 0; i < self->value.structure.size; i++) {
                 newValue->value.structure.components[i] = (MmsValue*) destinationAddress;
+                //memcpy(&(newValue->value.structure.components[i]), &(destinationAddress), sizeof (MmsValue*));
+
                 destinationAddress = MmsValue_cloneToBuffer(self->value.structure.components[i], destinationAddress);
             }
         }
diff --git a/src/mms/iso_mms/server/mms_access_result.c b/src/mms/iso_mms/server/mms_access_result.c
index 59d52ab6..8409e7b9 100644
--- a/src/mms/iso_mms/server/mms_access_result.c
+++ b/src/mms/iso_mms/server/mms_access_result.c
@@ -66,36 +66,28 @@ encodeArrayAccessResult(MmsValue* value, uint8_t* buffer, int bufPos, bool encod
 static int
 encodeStructuredAccessResult(MmsValue* value, uint8_t* buffer, int bufPos, bool encode)
 {
-    if (value == NULL) // TODO report internal error
-        return 0;
-
     int componentsSize = 0;
     int i;
     int size;
 
-    int components = value->value.structure.size;
+    int componentCount = value->value.structure.size;
 
-    for (i = 0; i < components; i++) {
-        MmsValue* component = value->value.structure.components[i];
+    MmsValue** components = value->value.structure.components;
 
-        componentsSize += mmsServer_encodeAccessResult(component, NULL, 0, false);
-    }
+    for (i = 0; i < componentCount; i++)
+        componentsSize += mmsServer_encodeAccessResult(components[i], NULL, 0, false);
 
     if (encode) {
         buffer[bufPos++] = 0xa2; /* tag for structure */
         bufPos = BerEncoder_encodeLength(componentsSize, buffer, bufPos);
 
-        for (i = 0; i < components; i++) {
-            MmsValue* component = value->value.structure.components[i];
-
-            bufPos = mmsServer_encodeAccessResult(component, buffer, bufPos, true);
-        }
+        for (i = 0; i < componentCount; i++)
+            bufPos = mmsServer_encodeAccessResult(components[i], buffer, bufPos, true);
 
         size = bufPos;
     }
-    else {
+    else
         size = 1 + componentsSize + BerEncoder_determineLengthSize(componentsSize);
-    }
 
     return size;
 }
@@ -103,9 +95,6 @@ encodeStructuredAccessResult(MmsValue* value, uint8_t* buffer, int bufPos, bool
 int
 mmsServer_encodeAccessResult(MmsValue* value, uint8_t* buffer, int bufPos, bool encode)
 {
-//    if (value == NULL) // TODO report internal error
-//        return 0;
-
     int size;
 
     switch (value->type) {
diff --git a/src/mms/iso_mms/server/mms_information_report.c b/src/mms/iso_mms/server/mms_information_report.c
index eee0bb25..3dd4127d 100644
--- a/src/mms/iso_mms/server/mms_information_report.c
+++ b/src/mms/iso_mms/server/mms_information_report.c
@@ -234,14 +234,10 @@ MmsServerConnection_sendInformationReportVMDSpecific(MmsServerConnection self, c
 	variableAccessSpecSize += BerEncoder_determineLengthSize(objectNameSize);
 	variableAccessSpecSize += 1; /* space for tag (a1) */
 
-    int variableCount = LinkedList_size(values);
-
     /* iterate values list and add values to the accessResultList */
     LinkedList value = LinkedList_getNext(values);
 
-    int i;
-
-    for (i = 0; i < variableCount; i++) {
+    while (value != NULL) {
 
         MmsValue* data = (MmsValue*) value->data;
 
@@ -267,7 +263,7 @@ MmsServerConnection_sendInformationReportVMDSpecific(MmsServerConnection self, c
         goto exit_function;
     }
 
-    if (DEBUG_MMS_SERVER) printf("MMS_SERVER: sendInfReport: %i items\n", variableCount);
+    if (DEBUG_MMS_SERVER) printf("MMS_SERVER: sendInfReport\n");
 
     ByteBuffer* reportBuffer =  self->server->reportBuffer;
 
@@ -286,7 +282,7 @@ MmsServerConnection_sendInformationReportVMDSpecific(MmsServerConnection self, c
 
     value = LinkedList_getNext(values);
 
-    for (i = 0; i < variableCount; i++) {
+    while (value != NULL) {
 
         MmsValue* data = (MmsValue*) value->data;