Index: leahi_dialin/td/modules/events.py
===================================================================
diff -u -r7ec1428451adfb2aabf7a64794e818a9916250c7 -rdd92f40a5a5b13449356328cf2526dd948c587ad
--- leahi_dialin/td/modules/events.py	(.../events.py)	(revision 7ec1428451adfb2aabf7a64794e818a9916250c7)
+++ leahi_dialin/td/modules/events.py	(.../events.py)	(revision dd92f40a5a5b13449356328cf2526dd948c587ad)
@@ -58,7 +58,7 @@
         self.sub_mode = 0                                               #: The new Operation Sub-Mode value
         self.event_op_mode_timestamp = 0.0                              #: The timestamp of the last Operation Mode change message
 
-        # Dictionary of the mode as key and the sub mode states enum class as the valued
+        # Dictionary of the mode as key and the sub mode enum class as the value
         self._op_mode_2_sub_mode = {td_enum_repository.TDOpModes.MODE_FAUL.name: td_enum_repository.TDFaultStates,
                                     td_enum_repository.TDOpModes.MODE_SERV.name: td_enum_repository.TDServiceStates,
                                     td_enum_repository.TDOpModes.MODE_INIT.name: td_enum_repository.TDInitStates,
@@ -68,7 +68,7 @@
                                     td_enum_repository.TDOpModes.MODE_POST.name: td_enum_repository.TDPostTreatmentStates,
                                     td_enum_repository.TDOpModes.MODE_NLEG.name: td_enum_repository.TDNotLegalStates }
 
-        # Dictionary of the sub mode as key and the state states enum class as the valued
+        # Dictionary of the sub-mode as key and the state enum class as the value
         self._sub_mode_2_states = {td_enum_repository.TDPreTreatmentModesStates.TD_PRE_TREATMENT_WATER_SAMPLE_STATE.name: td_enum_repository.TDPreTreaSampleWaterStates,
                                    td_enum_repository.TDPreTreatmentModesStates.TD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE.name: td_enum_repository.TDPreTreaNoCartSelfTestStates,
                                    td_enum_repository.TDPreTreatmentModesStates.TD_PRE_TREATMENT_SELF_TEST_DRY_STATE.name: td_enum_repository.TDPreTreaDrySelfTestStates,
@@ -84,7 +84,7 @@
                                    td_enum_repository.TDTreatmentStates.TREATMENT_HEPARIN_STATE.name:td_enum_repository.TDTreaHeparinStates,
                                    td_enum_repository.TDTreatmentStates.TREATMENT_END_STATE.name:td_enum_repository.TDTreaEndStates }
 
-        # Dictionary of the state as key and the sub state states enum class as the valued
+        # Dictionary of the state as key and the sub state enum class as the value
         self._state_2_sub_states = {td_enum_repository.TDPreTreaSampleWaterStates.SAMPLE_WATER_STATE.name: td_enum_repository.TDPreTreaSamplWaterUserActionStates,
                                     td_enum_repository.TDPreTreaPrimeStates.TD_PRIME_WET_SELF_TESTS_STATE.name: td_enum_repository.TDWetSelfTestsStates,
                                     td_enum_repository.TDTreaBloodPrimeStates.BLOOD_PRIME_RUN_STATE.name: td_enum_repository.TDTreaBloodPrimeUserActionStates,