diff --git a/dataLogger.py b/dataLogger.py
index d20ee74..94fc2aa 100644
--- a/dataLogger.py
+++ b/dataLogger.py
@@ -271,16 +271,16 @@ def main():
         #############
             stroke_tags['card_id'].read('test')
 
-            if not (last_stroke == stroke_tags['card_id'].value):
+            if not (last_stroke == stroke_tags['Card ID'].value):
                 sData = {}
-                last_stroke = stroke_tags['card_id'].value
+                last_stroke = stroke_tags['Card ID'].value
                 for t in stroke_tags:
-                    if not t == "card_id":
+                    if not t == "Card ID":
                         stroke_tags[t].read(True)
                 [sData['Surface_Position'], sData['Surface_Load'], sData['Downhole_Position'], sData['Downhole_Load']] = readPoints()
 
-                sData["card_type"] = stroke_tags['card_type'].value
-                sData["card_id"] = stroke_tags['card_id'].value
+                sData["card_type"] = stroke_tags['Card Type'].value
+                sData["card_id"] = stroke_tags['Card ID'].value
                 sData['sp_string'] = ', '.join(map(str, sData['Surface_Position']))
                 sData['sl_string'] = ', '.join(map(str, sData['Surface_Load']))
                 sData['dp_string'] = ', '.join(map(str, sData['Downhole_Position']))
@@ -347,7 +347,7 @@ def main():
             ##################
 
             well_test_entered = readTag(main_plc['address'], "Well_Test.Test_Submit")[0] > 0
-            if (well_test_entered == 0):
+            if well_test_entered:
                 if already_entered_well_test:
                     already_entered_well_test = False
                     print "Already entered well Test... Setting well_test_entered to False"
@@ -362,10 +362,10 @@ def main():
             # ALARMS & EVENTS #
             ###################
             for t in safety_tags:
-                safety_tags[t].checkStatus(stroke_tags['card_id'].value)
+                safety_tags[t].checkStatus(stroke_tags['Card ID'].value)
 
             for b in bit_tags:
-                bit_tags[b].checkStatus(stroke_tags['card_id'].value)
+                bit_tags[b].checkStatus(stroke_tags['Card ID'].value)
 
             time.sleep(.20)
         except Exception, e: