Index: dialin/dg/dialysate_generator.py
===================================================================
diff -u -r0fda7adada641f21bc4e01e55daf7a6c09c393fb -rcd974f59a331830091dc9518dc217f03b1ebd969
--- dialin/dg/dialysate_generator.py	(.../dialysate_generator.py)	(revision 0fda7adada641f21bc4e01e55daf7a6c09c393fb)
+++ dialin/dg/dialysate_generator.py	(.../dialysate_generator.py)	(revision cd974f59a331830091dc9518dc217f03b1ebd969)
@@ -133,7 +133,7 @@
         build = struct.unpack('H', bytearray(
             message['message'][self.START_POS_BUILD:self.END_POS_BUILD]))
 
-        self.dg_version = 'v' + str(major) + '.' + str(minor) + '.' + str(micro) + '-' + str(build)
+        self.dg_version = 'v' + str(major[0]) + '.' + str(minor[0]) + '.' + str(micro[0]) + '-' + str(build[0])
         print(self.dg_version)
 
     def handler_dg_op_mode_sync(self, message):
Index: dialin/dg/drain_pump.py
===================================================================
diff -u -r441eda312faf87b49f0967d8413690c7f63f9b58 -rcd974f59a331830091dc9518dc217f03b1ebd969
--- dialin/dg/drain_pump.py	(.../drain_pump.py)	(revision 441eda312faf87b49f0967d8413690c7f63f9b58)
+++ dialin/dg/drain_pump.py	(.../drain_pump.py)	(revision cd974f59a331830091dc9518dc217f03b1ebd969)
@@ -54,7 +54,7 @@
                                                                        self.handler_drain_pump_sync)
 
         self.target_drain_pump_speed_RPM = 0
-        self.dacValue = 0
+        self.dac_value = 0
 
     def handler_drain_pump_sync(self, message):
         """
@@ -71,7 +71,7 @@
             message['message'][self.START_POS_DAC:self.END_POS_DAC]))
 
         self.target_drain_pump_speed_RPM = tgt[0]
-        self.dacValue = dac[0]
+        self.dac_value = dac[0]
 
     def cmd_drain_pump_speed_set_point_override(self, speed, reset=NO_RESET):
         """
Index: dialin/dg/hd_proxy.py
===================================================================
diff -u -r441eda312faf87b49f0967d8413690c7f63f9b58 -rcd974f59a331830091dc9518dc217f03b1ebd969
--- dialin/dg/hd_proxy.py	(.../hd_proxy.py)	(revision 441eda312faf87b49f0967d8413690c7f63f9b58)
+++ dialin/dg/hd_proxy.py	(.../hd_proxy.py)	(revision cd974f59a331830091dc9518dc217f03b1ebd969)
@@ -171,7 +171,7 @@
         Constructs and sends the start/stop DG trimmer heater command
 
         \param start:  boolean - True = start heater, False = stop heater.
-        \returns 1 if successful, zero otherwise
+        \returns non-zero if successful, zero otherwise
         """
 
         if start:
Index: tests/uf_test.py
===================================================================
diff -u -r4978a43b887c2611ccbc40714cb789ea362eef90 -rcd974f59a331830091dc9518dc217f03b1ebd969
--- tests/uf_test.py	(.../uf_test.py)	(revision 4978a43b887c2611ccbc40714cb789ea362eef90)
+++ tests/uf_test.py	(.../uf_test.py)	(revision cd974f59a331830091dc9518dc217f03b1ebd969)
@@ -40,7 +40,10 @@
         # collect UF related data from HD and DG
         while True:
             sleep(1)
-            pumpSetPts = "B.s," + str(hd.bloodflow.target_blood_flow_rate) + \
+            modes = "HD.m," + str(hd.hd_operation_mode) + \
+                ",DG.m," + str(dg.dg_operation_mode) + \
+                ",Dg.s," + str(dg.dg_operation_sub_mode)
+            pumpSetPts = ",B.s," + str(hd.bloodflow.target_blood_flow_rate) + \
                 ",DI.s," + str(hd.dialysate_inlet_flow.target_dialysate_inlet_flow_rate) + \
                 ",DO.s,N/A,RO.s," + str(dg.ro_pump.target_pressure_psi) + \
                 ",DR.s," + str(dg.drain_pump.target_drain_pump_speed_RPM)
@@ -57,7 +60,7 @@
                 ",DI.w," + str(hd.dialysate_inlet_flow.pwm_duty_cycle_pct) +  \
                 ",DO.w," + str(hd.dialysate_outlet_flow.pwm_duty_cycle_pct) + \
                 ",RO.w," + str(dg.ro_pump.pwm_duty_cycle_pct) + \
-                ",DR.w," + str(dg.drain_pump.dacValue)
+                ",DR.w," + str(dg.drain_pump.dac_value)
             loadCells = ",A1," + str(dg.load_cells.load_cell_A1) + \
                 ",B1," + str(dg.load_cells.load_cell_B1) + \
                 ",A2," + str(dg.load_cells.load_cell_A2) + \
@@ -70,6 +73,7 @@
                 ",DRo," + str(dg.pressures.drain_pump_outlet_pressure)
 
             # log data
+            f.write(modes)
             f.write(pumpSetPts)
             f.write(pumpMeasSpds)
             f.write(pumpPWMs)
@@ -79,6 +83,7 @@
             f.write("\n")
 
             # print to console
+            print("          Modes: "+modes)
             print("Pump Set Points: "+pumpSetPts)
             print("    Pump Speeds: "+pumpMeasSpds)
             print(" Pump PWMs/DACs: "+pumpPWMs)