Index: sources/utility/format.h
===================================================================
diff -u -rc6a09899d2e46dc0bda5a6b994aa257953626f97 -r11909fd034451197eeb590176e4a8c52657cdab8
--- sources/utility/format.h	(.../format.h)	(revision c6a09899d2e46dc0bda5a6b994aa257953626f97)
+++ sources/utility/format.h	(.../format.h)	(revision 11909fd034451197eeb590176e4a8c52657cdab8)
@@ -19,6 +19,7 @@
 
 // Project
 
+#define FSN(vInt) QString::number(vInt)
 class Format
 {
     Format();
Index: sources/view/valarmstatus.cpp
===================================================================
diff -u -reea63d68fc0fb269f8dec64d99f488bcad117220 -r11909fd034451197eeb590176e4a8c52657cdab8
--- sources/view/valarmstatus.cpp	(.../valarmstatus.cpp)	(revision eea63d68fc0fb269f8dec64d99f488bcad117220)
+++ sources/view/valarmstatus.cpp	(.../valarmstatus.cpp)	(revision 11909fd034451197eeb590176e4a8c52657cdab8)
@@ -17,6 +17,7 @@
 
 // Project
 #include "guicontroller.h"
+#include "format.h"
 
 VIEW_DEF(VAlarmStatus, AlarmStatusData)
 
@@ -59,7 +60,7 @@
     if (key)
         return qPrintable(key);
     else
-        return QString("ALARM_ID_UNDEFINED [%1]").arg(vEnum);
+        return QString("ALARM_PRIORITY_UNDEFINED [%1]").arg(vEnum);
 }
 // coco end
 
@@ -88,19 +89,19 @@
 QString View::VAlarmStatus::text()
 {
     QString text;
-    if (_alarm_AlarmID != GuiAlarmID::ALARM_ID_NO_ALARM)
-        text = alarmIDText (static_cast<GuiAlarmID>(_alarm_AlarmID)) + " , " +
-                _alarm_EscalateIn                            + " , " +
-                _alarm_MuteTimeout                           + " [" +
-                (_alarm_Flag_systemFault        ? "1" : "0" ) + " " +
-                (_alarm_Flag_stop               ? "1" : "0" ) + " " +
-                (_alarm_Flag_noClear            ? "1" : "0" ) + " " +
-                (_alarm_Flag_noResume           ? "1" : "0" ) + " " +
-                (_alarm_Flag_noRinseback        ? "1" : "0" ) + " " +
-                (_alarm_Flag_noEndTreatment     ? "1" : "0" ) + " " +
-                (_alarm_Flag_noNewTreatment     ? "1" : "0" ) + " " +
-                (_alarm_Flag_bypassDialyzer     ? "1" : "0" ) + " " +
-                (_alarm_Flag_alarmsToEscalate   ? "1" : "0" ) + " " +
-                (_alarm_Flag_alarmsSilenced     ? "1" : "0" ) + "]" ;
+    if (alarm_AlarmID() != GuiAlarmID::ALARM_ID_NO_ALARM)
+        text = alarmIDText (static_cast<GuiAlarmID>(alarm_AlarmID())) + " , " +
+                 FSN(alarm_EscalateIn       ())                       + " , " +
+                 FSN(alarm_MuteTimeout      ())                + " ["+
+                (alarm_Flag_systemFault     ()   ? "1" : "0" ) + " " +
+                (alarm_Flag_stop            ()   ? "1" : "0" ) + " " +
+                (alarm_Flag_noClear         ()   ? "1" : "0" ) + " " +
+                (alarm_Flag_noResume        ()   ? "1" : "0" ) + " " +
+                (alarm_Flag_noRinseback     ()   ? "1" : "0" ) + " " +
+                (alarm_Flag_noEndTreatment  ()   ? "1" : "0" ) + " " +
+                (alarm_Flag_noNewTreatment  ()   ? "1" : "0" ) + " " +
+                (alarm_Flag_bypassDialyzer  ()   ? "1" : "0" ) + " " +
+                (alarm_Flag_alarmsToEscalate()   ? "1" : "0" ) + " " +
+                (alarm_Flag_alarmsSilenced  ()   ? "1" : "0" ) + "]" ;
     return text;
 }
Index: sources/view/vtreatmentadjustmentsresponse.h
===================================================================
diff -u -rea143a3b9822a985e0e6c2bad746cd04ae77e018 -r11909fd034451197eeb590176e4a8c52657cdab8
--- sources/view/vtreatmentadjustmentsresponse.h	(.../vtreatmentadjustmentsresponse.h)	(revision ea143a3b9822a985e0e6c2bad746cd04ae77e018)
+++ sources/view/vtreatmentadjustmentsresponse.h	(.../vtreatmentadjustmentsresponse.h)	(revision 11909fd034451197eeb590176e4a8c52657cdab8)
@@ -38,9 +38,9 @@
     PROPERTY( quint32   ,     bloodFlow_FlowSetPoint , 0, false)
     PROPERTY( quint32   , dialysateFlow_FlowSetPoint , 0, false)
 
-    // coco begin validated: The property triggered supposed to be always true
+    // coco begin validated: The property adjustment_Triggered has to be always true
     // and to always trigger the change event to work as a notifier for GUI
-    // has been manually tested that it works perfectly fine if used.
+    // has been manually tested that it works perfectly fine
     PROPERTY( bool      , adjustment_Triggered       , 0, true )
     // coco end
 
Index: sources/view/vtreatmentpressureocclusion.h
===================================================================
diff -u -r93d7ff58cd6fd2fea5d00587ee712a637fc941bf -r11909fd034451197eeb590176e4a8c52657cdab8
--- sources/view/vtreatmentpressureocclusion.h	(.../vtreatmentpressureocclusion.h)	(revision 93d7ff58cd6fd2fea5d00587ee712a637fc941bf)
+++ sources/view/vtreatmentpressureocclusion.h	(.../vtreatmentpressureocclusion.h)	(revision 11909fd034451197eeb590176e4a8c52657cdab8)
@@ -29,7 +29,7 @@
 
     PROPERTY( float, pressureocclusion_ArterialPressure             , 0, false)
     PROPERTY( float, pressureocclusion_VenousPressure               , 0, false)
-    // coco begin validated: these three properties have not been used in GUI.
+    // coco begin validated: These three properties have not been used in GUI.
     // has been manually tested that it works perfectly fine if used.
     PROPERTY( float, pressureocclusion_BloodPumpOcclusion           , 0, false)
     PROPERTY( float, pressureocclusion_DialysateInletPumpOcclusion  , 0, false)