diff --git a/acura_ilx_2016_can_generated.dbc b/acura_ilx_2016_can_generated.dbc
index b1e2b2c..361a75c 100644
--- a/acura_ilx_2016_can_generated.dbc
+++ b/acura_ilx_2016_can_generated.dbc
@@ -1,7 +1,7 @@
-CM_ "AUTOGENERATED FILE, DO NOT EDIT"
+CM_ "AUTOGENERATED FILE, DO NOT EDIT";
 
 
-CM_ "Imported file _comma.dbc starts here"
+CM_ "Imported file _comma.dbc starts here";
 BO_ 512 GAS_COMMAND: 6 EON
  SG_ GAS_COMMAND : 7|16@0+ (0.253984064,-83.3) [0|1] "" INTERCEPTOR
  SG_ GAS_COMMAND2 : 23|16@0+ (0.126992032,-83.3) [0|1] "" INTERCEPTOR
@@ -19,7 +19,7 @@ BO_ 513 GAS_SENSOR: 6 INTERCEPTOR
 VAL_ 513 STATE 5 "FAULT_TIMEOUT" 4 "FAULT_STARTUP" 3 "FAULT_SCE" 2 "FAULT_SEND" 1 "FAULT_BAD_CHECKSUM" 0 "NO_FAULT" ;
 
 
-CM_ "Imported file _honda_2017.dbc starts here"
+CM_ "Imported file _honda_2017.dbc starts here";
 VERSION ""
 
 
@@ -251,7 +251,7 @@ VAL_ 780 CRUISE_SPEED 255 "no_speed" 252 "stopped" ;
 VAL_ 780 HUD_LEAD 3 "acc_off" 2 "solid_car" 1 "dashed_car" 0 "no_car" ;
 VAL_ 829 BEEP 3 "single_beep" 2 "triple_beep" 1 "repeated_beep" 0 "no_beep" ;
 
-CM_ "acura_ilx_2016_can.dbc starts here"
+CM_ "acura_ilx_2016_can.dbc starts here";
 
 
 
diff --git a/acura_rdx_2018_can_generated.dbc b/acura_rdx_2018_can_generated.dbc
index 1a87ebc..895e11f 100644
--- a/acura_rdx_2018_can_generated.dbc
+++ b/acura_rdx_2018_can_generated.dbc
@@ -1,7 +1,7 @@
-CM_ "AUTOGENERATED FILE, DO NOT EDIT"
+CM_ "AUTOGENERATED FILE, DO NOT EDIT";
 
 
-CM_ "Imported file _comma.dbc starts here"
+CM_ "Imported file _comma.dbc starts here";
 BO_ 512 GAS_COMMAND: 6 EON
  SG_ GAS_COMMAND : 7|16@0+ (0.253984064,-83.3) [0|1] "" INTERCEPTOR
  SG_ GAS_COMMAND2 : 23|16@0+ (0.126992032,-83.3) [0|1] "" INTERCEPTOR
@@ -19,7 +19,7 @@ BO_ 513 GAS_SENSOR: 6 INTERCEPTOR
 VAL_ 513 STATE 5 "FAULT_TIMEOUT" 4 "FAULT_STARTUP" 3 "FAULT_SCE" 2 "FAULT_SEND" 1 "FAULT_BAD_CHECKSUM" 0 "NO_FAULT" ;
 
 
-CM_ "Imported file _honda_2017.dbc starts here"
+CM_ "Imported file _honda_2017.dbc starts here";
 VERSION ""
 
 
@@ -251,7 +251,7 @@ VAL_ 780 CRUISE_SPEED 255 "no_speed" 252 "stopped" ;
 VAL_ 780 HUD_LEAD 3 "acc_off" 2 "solid_car" 1 "dashed_car" 0 "no_car" ;
 VAL_ 829 BEEP 3 "single_beep" 2 "triple_beep" 1 "repeated_beep" 0 "no_beep" ;
 
-CM_ "acura_rdx_2018_can.dbc starts here"
+CM_ "acura_rdx_2018_can.dbc starts here";
 
 
 
diff --git a/acura_rdx_2020_can_generated.dbc b/acura_rdx_2020_can_generated.dbc
index b4adc66..d3c8f7c 100644
--- a/acura_rdx_2020_can_generated.dbc
+++ b/acura_rdx_2020_can_generated.dbc
@@ -1,7 +1,7 @@
-CM_ "AUTOGENERATED FILE, DO NOT EDIT"
+CM_ "AUTOGENERATED FILE, DO NOT EDIT";
 
 
-CM_ "Imported file _bosch_2020.dbc starts here"
+CM_ "Imported file _bosch_2020.dbc starts here";
 VERSION ""
 
 
@@ -375,7 +375,7 @@ CM_ SG_ 577 LINE_DASHED "1 = line is dashed";
 CM_ SG_ 577 LINE_SOLID "1 = line is solid";
 VAL_ 399 STEER_STATUS 6 "tmp_fault" 5 "fault_1" 4 "no_torque_alert_2" 3 "low_speed_lockout" 2 "no_torque_alert_1" 0 "normal" ;
 
-CM_ "acura_rdx_2020_can.dbc starts here"
+CM_ "acura_rdx_2020_can.dbc starts here";
 
 
 BO_ 304 GAS_PEDAL_2: 8 PCM
diff --git a/generator/generator.py b/generator/generator.py
index ceed4a0..b69c016 100755
--- a/generator/generator.py
+++ b/generator/generator.py
@@ -4,7 +4,7 @@ import re
 
 cur_path = os.path.dirname(os.path.realpath(__file__))
 opendbc_root = os.path.join(cur_path, '../')
-include_pattern = re.compile(r'CM_ "IMPORT (.*?)"')
+include_pattern = re.compile(r'CM_ "IMPORT (.*?)";')
 
 
 def read_dbc(src_dir, filename):
@@ -21,16 +21,16 @@ def create_dbc(src_dir, filename, output_path):
   output_file_location = os.path.join(output_path, output_filename)
 
   with open(output_file_location, 'w') as dbc_file_out:
-    dbc_file_out.write('CM_ "AUTOGENERATED FILE, DO NOT EDIT"\n')
+    dbc_file_out.write('CM_ "AUTOGENERATED FILE, DO NOT EDIT";\n')
 
     for include_filename in reversed(includes):
-      include_file_header = '\n\nCM_ "Imported file %s starts here"\n' % include_filename
+      include_file_header = '\n\nCM_ "Imported file %s starts here";\n' % include_filename
       dbc_file_out.write(include_file_header)
 
       include_file = read_dbc(src_dir, include_filename)
       dbc_file_out.write(include_file)
 
-    dbc_file_out.write('\nCM_ "%s starts here"\n' % filename)
+    dbc_file_out.write('\nCM_ "%s starts here";\n' % filename)
 
     core_dbc = include_pattern.sub('', dbc_file_in)
     dbc_file_out.write(core_dbc)
@@ -50,4 +50,4 @@ def create_all(output_path):
       create_dbc(src_dir, filename, output_path)
 
 if __name__ == "__main__":
-  create_all(opendbc_root)
+  create_all(opendbc_root)
\ No newline at end of file
diff --git a/generator/honda/acura_ilx_2016_can.dbc b/generator/honda/acura_ilx_2016_can.dbc
index 2d3c1a9..60efafc 100644
--- a/generator/honda/acura_ilx_2016_can.dbc
+++ b/generator/honda/acura_ilx_2016_can.dbc
@@ -1,5 +1,5 @@
-CM_ "IMPORT _honda_2017.dbc"
-CM_ "IMPORT _comma.dbc"
+CM_ "IMPORT _honda_2017.dbc";
+CM_ "IMPORT _comma.dbc";
 
 BO_ 145 KINEMATICS: 8 XXX
  SG_ LAT_ACCEL : 7|10@0+ (0.02,-512) [-20|20] "m/s2" EON
diff --git a/generator/honda/acura_rdx_2018_can.dbc b/generator/honda/acura_rdx_2018_can.dbc
index 01d9d64..173ddca 100644
--- a/generator/honda/acura_rdx_2018_can.dbc
+++ b/generator/honda/acura_rdx_2018_can.dbc
@@ -1,5 +1,5 @@
-CM_ "IMPORT _honda_2017.dbc"
-CM_ "IMPORT _comma.dbc"
+CM_ "IMPORT _honda_2017.dbc";
+CM_ "IMPORT _comma.dbc";
 
 BO_ 342 STEERING_SENSORS: 6 EPS
  SG_ STEER_ANGLE : 7|16@0- (-0.1,0) [-500|500] "deg" EON
diff --git a/generator/honda/acura_rdx_2020_can.dbc b/generator/honda/acura_rdx_2020_can.dbc
index 3106776..c65911d 100644
--- a/generator/honda/acura_rdx_2020_can.dbc
+++ b/generator/honda/acura_rdx_2020_can.dbc
@@ -1,4 +1,4 @@
-CM_ "IMPORT _bosch_2020.dbc"
+CM_ "IMPORT _bosch_2020.dbc";
 
 BO_ 304 GAS_PEDAL_2: 8 PCM
  SG_ ENGINE_TORQUE_ESTIMATE : 7|16@0- (1,0) [-1000|1000] "Nm" EON
diff --git a/generator/honda/honda_accord_lx15t_2018_can.dbc b/generator/honda/honda_accord_lx15t_2018_can.dbc
index 099b1a9..814ae06 100644
--- a/generator/honda/honda_accord_lx15t_2018_can.dbc
+++ b/generator/honda/honda_accord_lx15t_2018_can.dbc
@@ -1,4 +1,4 @@
-CM_ "IMPORT _bosch_2018.dbc"
+CM_ "IMPORT _bosch_2018.dbc";
 
 BO_ 304 GAS_PEDAL_2: 8 PCM
  SG_ ENGINE_TORQUE_ESTIMATE : 7|16@0- (1,0) [-1000|1000] "Nm" EON
diff --git a/generator/honda/honda_accord_s2t_2018_can.dbc b/generator/honda/honda_accord_s2t_2018_can.dbc
index 4967d60..687ce50 100644
--- a/generator/honda/honda_accord_s2t_2018_can.dbc
+++ b/generator/honda/honda_accord_s2t_2018_can.dbc
@@ -1,4 +1,4 @@
-CM_ "IMPORT _bosch_2018.dbc"
+CM_ "IMPORT _bosch_2018.dbc";
 
 BO_ 304 GAS_PEDAL_2: 8 PCM
  SG_ ENGINE_TORQUE_ESTIMATE : 7|16@0- (1,0) [-1000|1000] "Nm" EON
diff --git a/generator/honda/honda_civic_hatchback_ex_2017_can.dbc b/generator/honda/honda_civic_hatchback_ex_2017_can.dbc
index 91764a6..0b1457e 100644
--- a/generator/honda/honda_civic_hatchback_ex_2017_can.dbc
+++ b/generator/honda/honda_civic_hatchback_ex_2017_can.dbc
@@ -1,4 +1,4 @@
-CM_ "IMPORT _bosch_2018.dbc"
+CM_ "IMPORT _bosch_2018.dbc";
 
 BO_ 304 GAS_PEDAL_2: 8 PCM
  SG_ ENGINE_TORQUE_ESTIMATE : 7|16@0- (1,0) [-1000|1000] "Nm" EON
diff --git a/generator/honda/honda_civic_sedan_16_diesel_2019_can.dbc b/generator/honda/honda_civic_sedan_16_diesel_2019_can.dbc
index 4502fa7..8814c06 100644
--- a/generator/honda/honda_civic_sedan_16_diesel_2019_can.dbc
+++ b/generator/honda/honda_civic_sedan_16_diesel_2019_can.dbc
@@ -1,4 +1,4 @@
-CM_ "IMPORT _bosch_2018.dbc"
+CM_ "IMPORT _bosch_2018.dbc";
 
 BO_ 316 GAS_PEDAL_2: 8 XXX
  SG_ CAR_GAS : 39|8@0+ (1,0) [0|255] "" XXX
diff --git a/generator/honda/honda_civic_touring_2016_can.dbc b/generator/honda/honda_civic_touring_2016_can.dbc
index da4f59b..35a0ee1 100644
--- a/generator/honda/honda_civic_touring_2016_can.dbc
+++ b/generator/honda/honda_civic_touring_2016_can.dbc
@@ -1,5 +1,5 @@
-CM_ "IMPORT _honda_2017.dbc"
-CM_ "IMPORT _comma.dbc"
+CM_ "IMPORT _honda_2017.dbc";
+CM_ "IMPORT _comma.dbc";
 
 BO_ 148 KINEMATICS: 8 XXX
  SG_ LAT_ACCEL : 7|10@0+ (0.02,-512) [-20|20] "m/s2" EON
diff --git a/generator/honda/honda_clarity_hybrid_2018_can.dbc b/generator/honda/honda_clarity_hybrid_2018_can.dbc
index 80b4212..d2c7643 100644
--- a/generator/honda/honda_clarity_hybrid_2018_can.dbc
+++ b/generator/honda/honda_clarity_hybrid_2018_can.dbc
@@ -1,5 +1,5 @@
-CM_ "IMPORT _dual_can_nidec_2018.dbc"
-CM_ "IMPORT _comma.dbc"
+CM_ "IMPORT _dual_can_nidec_2018.dbc";
+CM_ "IMPORT _comma.dbc";
 
 BO_ 148 KINEMATICS: 8 XXX
  SG_ LAT_ACCEL : 7|10@0+ (0.02,-512) [-20|20] "m/s2" EON
diff --git a/generator/honda/honda_crv_ex_2017_can.dbc b/generator/honda/honda_crv_ex_2017_can.dbc
index 8382a9f..4fefee7 100644
--- a/generator/honda/honda_crv_ex_2017_can.dbc
+++ b/generator/honda/honda_crv_ex_2017_can.dbc
@@ -1,4 +1,4 @@
-CM_ "IMPORT _bosch_2018.dbc"
+CM_ "IMPORT _bosch_2018.dbc";
 
 BO_ 304 GAS_PEDAL_2: 8 PCM
  SG_ ENGINE_TORQUE_ESTIMATE : 7|16@0- (1,0) [-1000|1000] "Nm" EON
diff --git a/generator/honda/honda_crv_executive_2016_can.dbc b/generator/honda/honda_crv_executive_2016_can.dbc
index ac8082e..c47250a 100644
--- a/generator/honda/honda_crv_executive_2016_can.dbc
+++ b/generator/honda/honda_crv_executive_2016_can.dbc
@@ -1,5 +1,5 @@
-CM_ "IMPORT _honda_2017.dbc"
-CM_ "IMPORT _comma.dbc"
+CM_ "IMPORT _honda_2017.dbc";
+CM_ "IMPORT _comma.dbc";
 
 BO_ 342 STEERING_SENSORS: 6 EPS
  SG_ STEER_ANGLE : 7|16@0- (-0.1,0) [-500|500] "deg" EON
diff --git a/generator/honda/honda_crv_hybrid_2019_can.dbc b/generator/honda/honda_crv_hybrid_2019_can.dbc
index 692ab8d..6719b28 100644
--- a/generator/honda/honda_crv_hybrid_2019_can.dbc
+++ b/generator/honda/honda_crv_hybrid_2019_can.dbc
@@ -1,4 +1,4 @@
-CM_ "IMPORT _bosch_2018.dbc"
+CM_ "IMPORT _bosch_2018.dbc";
 
 BO_ 304 GAS_PEDAL_2: 8 PCM
  SG_ ENGINE_TORQUE_ESTIMATE : 7|16@0- (1,0) [-1000|1000] "Nm" EON
diff --git a/generator/honda/honda_crv_touring_2016_can.dbc b/generator/honda/honda_crv_touring_2016_can.dbc
index 6d113fa..ee7459d 100644
--- a/generator/honda/honda_crv_touring_2016_can.dbc
+++ b/generator/honda/honda_crv_touring_2016_can.dbc
@@ -1,5 +1,5 @@
-CM_ "IMPORT _honda_2017.dbc"
-CM_ "IMPORT _comma.dbc"
+CM_ "IMPORT _honda_2017.dbc";
+CM_ "IMPORT _comma.dbc";
 
 BO_ 342 STEERING_SENSORS: 6 EPS
  SG_ STEER_ANGLE : 7|16@0- (-0.1,0) [-500|500] "deg" EON
diff --git a/generator/honda/honda_fit_ex_2018_can.dbc b/generator/honda/honda_fit_ex_2018_can.dbc
index ed64c1f..0ba6486 100644
--- a/generator/honda/honda_fit_ex_2018_can.dbc
+++ b/generator/honda/honda_fit_ex_2018_can.dbc
@@ -1,5 +1,5 @@
-CM_ "IMPORT _honda_2017.dbc"
-CM_ "IMPORT _comma.dbc"
+CM_ "IMPORT _honda_2017.dbc";
+CM_ "IMPORT _comma.dbc";
 
 BO_ 145 KINEMATICS: 8 XXX
  SG_ LAT_ACCEL : 7|10@0+ (0.02,-512) [-20|20] "m/s2" EON
diff --git a/generator/honda/honda_fit_hybrid_2018_can.dbc b/generator/honda/honda_fit_hybrid_2018_can.dbc
index 4ceda6a..7ffd5be 100644
--- a/generator/honda/honda_fit_hybrid_2018_can.dbc
+++ b/generator/honda/honda_fit_hybrid_2018_can.dbc
@@ -1,5 +1,5 @@
-CM_ "IMPORT _dual_can_nidec_2018.dbc"
-CM_ "IMPORT _comma.dbc"
+CM_ "IMPORT _dual_can_nidec_2018.dbc";
+CM_ "IMPORT _comma.dbc";
 
 BO_ 145 KINEMATICS: 8 XXX
  SG_ LAT_ACCEL : 7|10@0+ (0.02,-512) [-20|20] "m/s2" EON
diff --git a/generator/honda/honda_hrv_touring_2019_can.dbc b/generator/honda/honda_hrv_touring_2019_can.dbc
index 9c7b6ed..48effc8 100644
--- a/generator/honda/honda_hrv_touring_2019_can.dbc
+++ b/generator/honda/honda_hrv_touring_2019_can.dbc
@@ -1,5 +1,5 @@
-CM_ "IMPORT _honda_2017.dbc"
-CM_ "IMPORT _comma.dbc"
+CM_ "IMPORT _honda_2017.dbc";
+CM_ "IMPORT _comma.dbc";
 
 BO_ 145 KINEMATICS: 8 XXX
  SG_ LAT_ACCEL : 7|10@0+ (0.02,-512) [-20|20] "m/s2" EON
diff --git a/generator/honda/honda_insight_ex_2019_can.dbc b/generator/honda/honda_insight_ex_2019_can.dbc
index 770b3a1..8224c49 100644
--- a/generator/honda/honda_insight_ex_2019_can.dbc
+++ b/generator/honda/honda_insight_ex_2019_can.dbc
@@ -1,4 +1,4 @@
-CM_ "IMPORT _bosch_2018.dbc"
+CM_ "IMPORT _bosch_2018.dbc";
 
 BO_ 304 GAS_PEDAL_2: 8 PCM
  SG_ ENGINE_TORQUE_ESTIMATE : 7|16@0- (1,0) [-1000|1000] "Nm" EON
diff --git a/generator/honda/honda_odyssey_exl_2018.dbc b/generator/honda/honda_odyssey_exl_2018.dbc
index 64cff2e..59074d5 100644
--- a/generator/honda/honda_odyssey_exl_2018.dbc
+++ b/generator/honda/honda_odyssey_exl_2018.dbc
@@ -1,5 +1,5 @@
-CM_ "IMPORT _honda_2017.dbc"
-CM_ "IMPORT _comma.dbc"
+CM_ "IMPORT _honda_2017.dbc";
+CM_ "IMPORT _comma.dbc";
 
 BO_ 228 STEERING_CONTROL: 5 ADAS
  SG_ STEER_TORQUE : 7|16@0- (1,0) [-3840|3840] "" EPS
diff --git a/generator/honda/honda_odyssey_extreme_edition_2018_china_can.dbc b/generator/honda/honda_odyssey_extreme_edition_2018_china_can.dbc
index 3ffe59a..41c29aa 100644
--- a/generator/honda/honda_odyssey_extreme_edition_2018_china_can.dbc
+++ b/generator/honda/honda_odyssey_extreme_edition_2018_china_can.dbc
@@ -1,5 +1,5 @@
-CM_ "IMPORT _honda_2017.dbc"
-CM_ "IMPORT _comma.dbc"
+CM_ "IMPORT _honda_2017.dbc";
+CM_ "IMPORT _comma.dbc";
 
 BO_ 316 GAS_PEDAL: 8 PCM
  SG_ CAR_GAS : 39|8@0+ (1,0) [0|255] "" EON
diff --git a/generator/honda/honda_pilot_touring_2017_can.dbc b/generator/honda/honda_pilot_touring_2017_can.dbc
index 1da2248..93256cf 100644
--- a/generator/honda/honda_pilot_touring_2017_can.dbc
+++ b/generator/honda/honda_pilot_touring_2017_can.dbc
@@ -1,5 +1,5 @@
-CM_ "IMPORT _honda_2017.dbc"
-CM_ "IMPORT _comma.dbc"
+CM_ "IMPORT _honda_2017.dbc";
+CM_ "IMPORT _comma.dbc";
 
 BO_ 145 KINEMATICS: 8 XXX
  SG_ LAT_ACCEL : 7|10@0+ (0.02,-512) [-20|20] "m/s2" EON
diff --git a/generator/honda/honda_ridgeline_black_edition_2017_can.dbc b/generator/honda/honda_ridgeline_black_edition_2017_can.dbc
index adc23d6..1635744 100644
--- a/generator/honda/honda_ridgeline_black_edition_2017_can.dbc
+++ b/generator/honda/honda_ridgeline_black_edition_2017_can.dbc
@@ -1,5 +1,5 @@
-CM_ "IMPORT _honda_2017.dbc"
-CM_ "IMPORT _comma.dbc"
+CM_ "IMPORT _honda_2017.dbc";
+CM_ "IMPORT _comma.dbc";
 
 BO_ 145 KINEMATICS: 8 XXX
  SG_ LAT_ACCEL : 7|10@0+ (0.02,-512) [-20|20] "m/s2" EON
diff --git a/generator/subaru/subaru_forester_2017.dbc b/generator/subaru/subaru_forester_2017.dbc
index 780089c..f82ca1f 100644
--- a/generator/subaru/subaru_forester_2017.dbc
+++ b/generator/subaru/subaru_forester_2017.dbc
@@ -1,4 +1,4 @@
-CM_ "IMPORT _subaru_preglobal_2015.dbc"
+CM_ "IMPORT _subaru_preglobal_2015.dbc";
 
 BO_ 355 ES_DashStatus: 8 XXX
  SG_ Not_Ready_Startup : 4|2@1+ (1,0) [0|3] "" XXX
diff --git a/generator/subaru/subaru_global_2017.dbc b/generator/subaru/subaru_global_2017.dbc
index 1df1051..28601b0 100644
--- a/generator/subaru/subaru_global_2017.dbc
+++ b/generator/subaru/subaru_global_2017.dbc
@@ -1,4 +1,4 @@
-CM_ "IMPORT _subaru_global.dbc"
+CM_ "IMPORT _subaru_global.dbc";
 
 BO_ 72 Transmission: 8 XXX
  SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX
diff --git a/generator/subaru/subaru_global_2020_hybrid.dbc b/generator/subaru/subaru_global_2020_hybrid.dbc
index f74caad..755ee4f 100644
--- a/generator/subaru/subaru_global_2020_hybrid.dbc
+++ b/generator/subaru/subaru_global_2020_hybrid.dbc
@@ -1,4 +1,4 @@
-CM_ "IMPORT _subaru_global.dbc"
+CM_ "IMPORT _subaru_global.dbc";
 
 BO_ 39 Cruise_Status_2: 8 XXX
  SG_ Cruise_Activated : 37|1@0+ (1,0) [0|1] "" XXX
diff --git a/generator/subaru/subaru_outback_2015.dbc b/generator/subaru/subaru_outback_2015.dbc
index e1d6623..2148d83 100644
--- a/generator/subaru/subaru_outback_2015.dbc
+++ b/generator/subaru/subaru_outback_2015.dbc
@@ -1,4 +1,4 @@
-CM_ "IMPORT _subaru_preglobal_2015.dbc"
+CM_ "IMPORT _subaru_preglobal_2015.dbc";
 
 BO_ 358 ES_DashStatus: 8 XXX
  SG_ Not_Ready_Startup : 0|3@1+ (1,0) [0|7] "" XXX
diff --git a/generator/subaru/subaru_outback_2019.dbc b/generator/subaru/subaru_outback_2019.dbc
index 64dee4c..ca74a08 100644
--- a/generator/subaru/subaru_outback_2019.dbc
+++ b/generator/subaru/subaru_outback_2019.dbc
@@ -1,4 +1,4 @@
-CM_ "IMPORT _subaru_preglobal_2015.dbc"
+CM_ "IMPORT _subaru_preglobal_2015.dbc";
 
 BO_ 358 ES_DashStatus: 8 XXX
  SG_ Not_Ready_Startup : 0|3@1+ (1,0) [0|7] "" XXX
diff --git a/generator/toyota/_comma.dbc b/generator/toyota/_comma.dbc
index c8f4c55..1100e71 100644
--- a/generator/toyota/_comma.dbc
+++ b/generator/toyota/_comma.dbc
@@ -8,7 +8,7 @@ BO_ 359 STEERING_IPAS_COMMA: 8 IPAS
  SG_ SET_ME_X00 : 55|8@0+ (1,0) [0|255] "" XXX
  SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
 
-CM BO_ STEERING_IPAS_COMMA "Copy of msg 614 so we can do angle control while the Park Assist ECU is connected (Panda spoofs 614 with 359 on connector J70). Note that addresses 0x266 and 0x167 are checksum-invariant";
+CM_ "BO_ STEERING_IPAS_COMMA: Copy of msg 614 so we can do angle control while the Park Assist ECU is connected (Panda spoofs 614 with 359 on connector J70). Note that addresses 0x266 and 0x167 are checksum-invariant";
 
  BO_ 512 GAS_COMMAND: 6 EON
   SG_ GAS_COMMAND : 7|16@0+ (0.159375,-75.555) [0|1] "" INTERCEPTOR
@@ -29,4 +29,4 @@ CM BO_ STEERING_IPAS_COMMA "Copy of msg 614 so we can do angle control while the
 BO_ 35 SECONDARY_STEER_ANGLE: 8 XXX
  SG_ ZORRO_STEER : 7|24@0- (0.004901594652,0) [-500|500] "" XXX
 
-CM BO_ SECONDARY_STEER_ANGLE "ZSS is a high-precision steering angle sensor that can replace the lower resolution sensor in most TSS1 Toyotas. Learn more: https://github.com/commaai/openpilot/wiki/Toyota-Lexus#zorro-steering-sensor-zss";
+CM_ "BO_ SECONDARY_STEER_ANGLE: ZSS is a high-precision steering angle sensor that can replace the lower resolution sensor in most TSS1 Toyotas. Learn more: https://github.com/commaai/openpilot/wiki/Toyota-Lexus#zorro-steering-sensor-zss";
diff --git a/generator/toyota/_toyota_2017.dbc b/generator/toyota/_toyota_2017.dbc
index ebe9b2a..f8348aa 100644
--- a/generator/toyota/_toyota_2017.dbc
+++ b/generator/toyota/_toyota_2017.dbc
@@ -286,7 +286,7 @@ CM_ SG_ 614 ANGLE "set to measured angle when ipas control isn't active";
 CM_ SG_ 643 COUNTER "only used on cars that use this msg for cruise control";
 CM_ SG_ 643 BRAKE_STATUS "only used on cars that use this msg for cruise control";
 CM_ SG_ 643 PRECOLLISION_ACTIVE "set 0.5s before any braking";
-CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was "SET_ME_1" and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG.";
+CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was 'SET_ME_1' and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG.";
 CM_ SG_ 835 ACCEL_CMD_ALT "Copy of main ACCEL_CMD, but across 8 bits instead of 16 bits like ACCEL_CMD. Unsure if only informational or has an effect. Likely informational as existing openpilot sets this to 0 and no loss of functionality observed. Originally 'AT_RAW' in leaked toyota_2017_ref_pt.dbc file.";
 CM_ SG_ 921 UI_SET_SPEED "set speed shown in UI with user set unit";
 CM_ SG_ 951 BRAKE_LIGHTS_ACC "brake lights when ACC commands decel";
@@ -294,7 +294,7 @@ CM_ SG_ 1042 SET_ME_1 "unclear what this is, but it's always 1 in drive traces";
 CM_ SG_ 1042 REPEATED_BEEPS "recommended for fcw and other important alerts";
 CM_ SG_ 1161 SPDVAL1 "Numbers 0-199 is displayed, 200-254 displays circle without number and 255 is for no limit.";
 CM_ SG_ 1161 SYNCID1 "counter from 1 to f at 1 Hz";
-CM_ SG_ 1161 SPDVAL2 "conditional speed value 70"
+CM_ SG_ 1161 SPDVAL2 "conditional speed value 70";
 CM_ SG_ 1162 SGNNUMP "1 if SPDVAL1 is set, otherwise 0";
 CM_ SG_ 1162 SYNCID2 "counter from 1 to f at 1 Hz";
 CM_ SG_ 1163 TSREQPD "always 1";
diff --git a/generator/toyota/lexus_ct200h_2018_pt.dbc b/generator/toyota/lexus_ct200h_2018_pt.dbc
index 1024849..ea5d5f1 100644
--- a/generator/toyota/lexus_ct200h_2018_pt.dbc
+++ b/generator/toyota/lexus_ct200h_2018_pt.dbc
@@ -1,5 +1,5 @@
-CM_ "IMPORT _toyota_2017.dbc"
-CM_ "IMPORT _comma.dbc"
+CM_ "IMPORT _toyota_2017.dbc";
+CM_ "IMPORT _comma.dbc";
 
 BO_ 548 BRAKE_MODULE: 8 XXX
  SG_ BRAKE_PRESSURE : 43|12@0+ (1,0) [0|4047] "" XXX
diff --git a/generator/toyota/lexus_gs300h_2017_pt.dbc b/generator/toyota/lexus_gs300h_2017_pt.dbc
index 35ad1c8..0a6dbe1 100644
--- a/generator/toyota/lexus_gs300h_2017_pt.dbc
+++ b/generator/toyota/lexus_gs300h_2017_pt.dbc
@@ -1,5 +1,5 @@
-CM_ "IMPORT _toyota_2017.dbc"
-CM_ "IMPORT _comma.dbc"
+CM_ "IMPORT _toyota_2017.dbc";
+CM_ "IMPORT _comma.dbc";
 
 BO_ 550 BRAKE_MODULE: 8 XXX
  SG_ BRAKE_PRESSURE : 0|9@0+ (1,0) [0|511] "" XXX
diff --git a/generator/toyota/lexus_is_2018_pt.dbc b/generator/toyota/lexus_is_2018_pt.dbc
index e1a6922..034aa1b 100644
--- a/generator/toyota/lexus_is_2018_pt.dbc
+++ b/generator/toyota/lexus_is_2018_pt.dbc
@@ -1,5 +1,5 @@
-CM_ "IMPORT _toyota_2017.dbc"
-CM_ "IMPORT _comma.dbc"
+CM_ "IMPORT _toyota_2017.dbc";
+CM_ "IMPORT _comma.dbc";
 
 BO_ 550 BRAKE_MODULE: 8 XXX
  SG_ BRAKE_PRESSURE : 0|9@0+ (1,0) [0|511] "" XXX
diff --git a/generator/toyota/lexus_nx300_2018_pt.dbc b/generator/toyota/lexus_nx300_2018_pt.dbc
index 420da0e..524aec3 100644
--- a/generator/toyota/lexus_nx300_2018_pt.dbc
+++ b/generator/toyota/lexus_nx300_2018_pt.dbc
@@ -1,5 +1,5 @@
-CM_ "IMPORT _toyota_2017.dbc"
-CM_ "IMPORT _comma.dbc"
+CM_ "IMPORT _toyota_2017.dbc";
+CM_ "IMPORT _comma.dbc";
 
 BO_ 550 BRAKE_MODULE: 8 XXX
  SG_ BRAKE_PRESSURE : 0|9@0+ (1,0) [0|511] "" XXX
diff --git a/generator/toyota/lexus_nx300h_2018_pt.dbc b/generator/toyota/lexus_nx300h_2018_pt.dbc
index 9652684..5fd7210 100644
--- a/generator/toyota/lexus_nx300h_2018_pt.dbc
+++ b/generator/toyota/lexus_nx300h_2018_pt.dbc
@@ -1,5 +1,5 @@
-CM_ "IMPORT _toyota_2017.dbc"
-CM_ "IMPORT _comma.dbc"
+CM_ "IMPORT _toyota_2017.dbc";
+CM_ "IMPORT _comma.dbc";
 
 BO_ 550 BRAKE_MODULE: 8 XXX
  SG_ BRAKE_PRESSURE : 0|9@0+ (1,0) [0|511] "" XXX
diff --git a/generator/toyota/lexus_rx_350_2016_pt.dbc b/generator/toyota/lexus_rx_350_2016_pt.dbc
index 03f314b..63b1032 100644
--- a/generator/toyota/lexus_rx_350_2016_pt.dbc
+++ b/generator/toyota/lexus_rx_350_2016_pt.dbc
@@ -1,5 +1,5 @@
-CM_ "IMPORT _toyota_2017.dbc"
-CM_ "IMPORT _comma.dbc"
+CM_ "IMPORT _toyota_2017.dbc";
+CM_ "IMPORT _comma.dbc";
 
 BO_ 550 BRAKE_MODULE: 8 XXX
  SG_ BRAKE_PRESSURE : 0|9@0+ (1,0) [0|511] "" XXX
diff --git a/generator/toyota/lexus_rx_hybrid_2017_pt.dbc b/generator/toyota/lexus_rx_hybrid_2017_pt.dbc
index 9652684..5fd7210 100644
--- a/generator/toyota/lexus_rx_hybrid_2017_pt.dbc
+++ b/generator/toyota/lexus_rx_hybrid_2017_pt.dbc
@@ -1,5 +1,5 @@
-CM_ "IMPORT _toyota_2017.dbc"
-CM_ "IMPORT _comma.dbc"
+CM_ "IMPORT _toyota_2017.dbc";
+CM_ "IMPORT _comma.dbc";
 
 BO_ 550 BRAKE_MODULE: 8 XXX
  SG_ BRAKE_PRESSURE : 0|9@0+ (1,0) [0|511] "" XXX
diff --git a/generator/toyota/toyota_avalon_2017_pt.dbc b/generator/toyota/toyota_avalon_2017_pt.dbc
index 219cfa3..9eea8b0 100644
--- a/generator/toyota/toyota_avalon_2017_pt.dbc
+++ b/generator/toyota/toyota_avalon_2017_pt.dbc
@@ -1,5 +1,5 @@
-CM_ "IMPORT _toyota_2017.dbc"
-CM_ "IMPORT _comma.dbc"
+CM_ "IMPORT _toyota_2017.dbc";
+CM_ "IMPORT _comma.dbc";
 
 BO_ 550 BRAKE_MODULE: 8 XXX
  SG_ BRAKE_PRESSURE : 0|9@0+ (1,0) [0|255] "" XXX
diff --git a/generator/toyota/toyota_camry_hybrid_2018_pt.dbc b/generator/toyota/toyota_camry_hybrid_2018_pt.dbc
index 8b2cda1..e603763 100644
--- a/generator/toyota/toyota_camry_hybrid_2018_pt.dbc
+++ b/generator/toyota/toyota_camry_hybrid_2018_pt.dbc
@@ -1,5 +1,5 @@
-CM_ "IMPORT _toyota_2017.dbc"
-CM_ "IMPORT _comma.dbc"
+CM_ "IMPORT _toyota_2017.dbc";
+CM_ "IMPORT _comma.dbc";
 
 BO_ 295 GEAR_PACKET: 8 XXX
  SG_ CAR_MOVEMENT : 39|8@0- (1,0) [0|255] "" XXX
diff --git a/generator/toyota/toyota_corolla_2017_pt.dbc b/generator/toyota/toyota_corolla_2017_pt.dbc
index 71cdbde..b78a484 100644
--- a/generator/toyota/toyota_corolla_2017_pt.dbc
+++ b/generator/toyota/toyota_corolla_2017_pt.dbc
@@ -1,5 +1,5 @@
-CM_ "IMPORT _toyota_2017.dbc"
-CM_ "IMPORT _comma.dbc"
+CM_ "IMPORT _toyota_2017.dbc";
+CM_ "IMPORT _comma.dbc";
 
 BO_ 548 BRAKE_MODULE: 8 XXX
  SG_ BRAKE_PRESSURE : 43|12@0+ (1,0) [0|4047] "" XXX
diff --git a/generator/toyota/toyota_highlander_2017_pt.dbc b/generator/toyota/toyota_highlander_2017_pt.dbc
index 219cfa3..9eea8b0 100644
--- a/generator/toyota/toyota_highlander_2017_pt.dbc
+++ b/generator/toyota/toyota_highlander_2017_pt.dbc
@@ -1,5 +1,5 @@
-CM_ "IMPORT _toyota_2017.dbc"
-CM_ "IMPORT _comma.dbc"
+CM_ "IMPORT _toyota_2017.dbc";
+CM_ "IMPORT _comma.dbc";
 
 BO_ 550 BRAKE_MODULE: 8 XXX
  SG_ BRAKE_PRESSURE : 0|9@0+ (1,0) [0|255] "" XXX
diff --git a/generator/toyota/toyota_highlander_hybrid_2018_pt.dbc b/generator/toyota/toyota_highlander_hybrid_2018_pt.dbc
index 9d6484d..1170733 100644
--- a/generator/toyota/toyota_highlander_hybrid_2018_pt.dbc
+++ b/generator/toyota/toyota_highlander_hybrid_2018_pt.dbc
@@ -1,5 +1,5 @@
-CM_ "IMPORT _toyota_2017.dbc"
-CM_ "IMPORT _comma.dbc"
+CM_ "IMPORT _toyota_2017.dbc";
+CM_ "IMPORT _comma.dbc";
 
 BO_ 550 BRAKE_MODULE: 8 XXX
  SG_ BRAKE_PRESSURE : 0|9@0+ (1,0) [0|511] "" XXX
diff --git a/generator/toyota/toyota_nodsu_hybrid_pt.dbc b/generator/toyota/toyota_nodsu_hybrid_pt.dbc
index ef5f0f1..43783e1 100644
--- a/generator/toyota/toyota_nodsu_hybrid_pt.dbc
+++ b/generator/toyota/toyota_nodsu_hybrid_pt.dbc
@@ -1,6 +1,6 @@
-CM_ "IMPORT _toyota_2017.dbc"
-CM_ "IMPORT _comma.dbc"
-CM_ "IMPORT _toyota_nodsu_bsm.dbc"
+CM_ "IMPORT _toyota_2017.dbc";
+CM_ "IMPORT _comma.dbc";
+CM_ "IMPORT _toyota_nodsu_bsm.dbc";
 
 BO_ 295 GEAR_PACKET: 8 XXX
  SG_ CAR_MOVEMENT : 39|8@0- (1,0) [0|255] "" XXX
diff --git a/generator/toyota/toyota_nodsu_pt.dbc b/generator/toyota/toyota_nodsu_pt.dbc
index c02b94c..1e70cce 100644
--- a/generator/toyota/toyota_nodsu_pt.dbc
+++ b/generator/toyota/toyota_nodsu_pt.dbc
@@ -1,6 +1,6 @@
-CM_ "IMPORT _toyota_2017.dbc"
-CM_ "IMPORT _comma.dbc"
-CM_ "IMPORT _toyota_nodsu_bsm.dbc"
+CM_ "IMPORT _toyota_2017.dbc";
+CM_ "IMPORT _comma.dbc";
+CM_ "IMPORT _toyota_nodsu_bsm.dbc";
 
 BO_ 401 STEERING_LTA: 8 XXX
  SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
diff --git a/generator/toyota/toyota_prius_2017_pt.dbc b/generator/toyota/toyota_prius_2017_pt.dbc
index cf04ee7..55e871e 100644
--- a/generator/toyota/toyota_prius_2017_pt.dbc
+++ b/generator/toyota/toyota_prius_2017_pt.dbc
@@ -1,5 +1,5 @@
-CM_ "IMPORT _toyota_2017.dbc"
-CM_ "IMPORT _comma.dbc"
+CM_ "IMPORT _toyota_2017.dbc";
+CM_ "IMPORT _comma.dbc";
 
 BO_ 295 GEAR_PACKET: 8 XXX
  SG_ CAR_MOVEMENT : 39|8@0- (1,0) [0|255] "" XXX
diff --git a/generator/toyota/toyota_rav4_2017_pt.dbc b/generator/toyota/toyota_rav4_2017_pt.dbc
index 79f99be..cebb8f1 100644
--- a/generator/toyota/toyota_rav4_2017_pt.dbc
+++ b/generator/toyota/toyota_rav4_2017_pt.dbc
@@ -1,5 +1,5 @@
-CM_ "IMPORT _toyota_2017.dbc"
-CM_ "IMPORT _comma.dbc"
+CM_ "IMPORT _toyota_2017.dbc";
+CM_ "IMPORT _comma.dbc";
 
 BO_ 548 BRAKE_MODULE: 8 XXX
  SG_ BRAKE_PRESSURE : 43|12@0+ (1,0) [0|4047] "" XXX
diff --git a/generator/toyota/toyota_rav4_hybrid_2017_pt.dbc b/generator/toyota/toyota_rav4_hybrid_2017_pt.dbc
index bf7146a..44f2cb5 100644
--- a/generator/toyota/toyota_rav4_hybrid_2017_pt.dbc
+++ b/generator/toyota/toyota_rav4_hybrid_2017_pt.dbc
@@ -1,5 +1,5 @@
-CM_ "IMPORT _toyota_2017.dbc"
-CM_ "IMPORT _comma.dbc"
+CM_ "IMPORT _toyota_2017.dbc";
+CM_ "IMPORT _comma.dbc";
 
 BO_ 550 BRAKE_MODULE: 8 XXX
  SG_ BRAKE_PRESSURE : 0|9@0+ (1,0) [0|511] "" XXX
diff --git a/generator/toyota/toyota_sienna_xle_2018_pt.dbc b/generator/toyota/toyota_sienna_xle_2018_pt.dbc
index 394cc04..4bc56be 100644
--- a/generator/toyota/toyota_sienna_xle_2018_pt.dbc
+++ b/generator/toyota/toyota_sienna_xle_2018_pt.dbc
@@ -1,5 +1,5 @@
-CM_ "IMPORT _toyota_2017.dbc"
-CM_ "IMPORT _comma.dbc"
+CM_ "IMPORT _toyota_2017.dbc";
+CM_ "IMPORT _comma.dbc";
 
 BO_ 550 BRAKE_MODULE: 8 XXX
  SG_ BRAKE_PRESSURE : 0|9@0+ (1,0) [0|255] "" XXX
diff --git a/honda_accord_lx15t_2018_can_generated.dbc b/honda_accord_lx15t_2018_can_generated.dbc
index 0ce46d5..25b4c15 100644
--- a/honda_accord_lx15t_2018_can_generated.dbc
+++ b/honda_accord_lx15t_2018_can_generated.dbc
@@ -1,7 +1,7 @@
-CM_ "AUTOGENERATED FILE, DO NOT EDIT"
+CM_ "AUTOGENERATED FILE, DO NOT EDIT";
 
 
-CM_ "Imported file _bosch_2018.dbc starts here"
+CM_ "Imported file _bosch_2018.dbc starts here";
 VERSION ""
 
 
@@ -379,7 +379,7 @@ CM_ SG_ 577 LINE_DASHED "1 = line is dashed";
 CM_ SG_ 577 LINE_SOLID "1 = line is solid";
 VAL_ 399 STEER_STATUS 6 "tmp_fault" 5 "fault_1" 4 "no_torque_alert_2" 3 "low_speed_lockout" 2 "no_torque_alert_1" 0 "normal" ;
 
-CM_ "honda_accord_lx15t_2018_can.dbc starts here"
+CM_ "honda_accord_lx15t_2018_can.dbc starts here";
 
 
 BO_ 304 GAS_PEDAL_2: 8 PCM
diff --git a/honda_accord_s2t_2018_can_generated.dbc b/honda_accord_s2t_2018_can_generated.dbc
index 8204b3d..6407b49 100644
--- a/honda_accord_s2t_2018_can_generated.dbc
+++ b/honda_accord_s2t_2018_can_generated.dbc
@@ -1,7 +1,7 @@
-CM_ "AUTOGENERATED FILE, DO NOT EDIT"
+CM_ "AUTOGENERATED FILE, DO NOT EDIT";
 
 
-CM_ "Imported file _bosch_2018.dbc starts here"
+CM_ "Imported file _bosch_2018.dbc starts here";
 VERSION ""
 
 
@@ -379,7 +379,7 @@ CM_ SG_ 577 LINE_DASHED "1 = line is dashed";
 CM_ SG_ 577 LINE_SOLID "1 = line is solid";
 VAL_ 399 STEER_STATUS 6 "tmp_fault" 5 "fault_1" 4 "no_torque_alert_2" 3 "low_speed_lockout" 2 "no_torque_alert_1" 0 "normal" ;
 
-CM_ "honda_accord_s2t_2018_can.dbc starts here"
+CM_ "honda_accord_s2t_2018_can.dbc starts here";
 
 
 BO_ 304 GAS_PEDAL_2: 8 PCM
diff --git a/honda_civic_hatchback_ex_2017_can_generated.dbc b/honda_civic_hatchback_ex_2017_can_generated.dbc
index d9c69c6..0443f2d 100644
--- a/honda_civic_hatchback_ex_2017_can_generated.dbc
+++ b/honda_civic_hatchback_ex_2017_can_generated.dbc
@@ -1,7 +1,7 @@
-CM_ "AUTOGENERATED FILE, DO NOT EDIT"
+CM_ "AUTOGENERATED FILE, DO NOT EDIT";
 
 
-CM_ "Imported file _bosch_2018.dbc starts here"
+CM_ "Imported file _bosch_2018.dbc starts here";
 VERSION ""
 
 
@@ -379,7 +379,7 @@ CM_ SG_ 577 LINE_DASHED "1 = line is dashed";
 CM_ SG_ 577 LINE_SOLID "1 = line is solid";
 VAL_ 399 STEER_STATUS 6 "tmp_fault" 5 "fault_1" 4 "no_torque_alert_2" 3 "low_speed_lockout" 2 "no_torque_alert_1" 0 "normal" ;
 
-CM_ "honda_civic_hatchback_ex_2017_can.dbc starts here"
+CM_ "honda_civic_hatchback_ex_2017_can.dbc starts here";
 
 
 BO_ 304 GAS_PEDAL_2: 8 PCM
diff --git a/honda_civic_sedan_16_diesel_2019_can_generated.dbc b/honda_civic_sedan_16_diesel_2019_can_generated.dbc
index 885de71..fecfc58 100644
--- a/honda_civic_sedan_16_diesel_2019_can_generated.dbc
+++ b/honda_civic_sedan_16_diesel_2019_can_generated.dbc
@@ -1,7 +1,7 @@
-CM_ "AUTOGENERATED FILE, DO NOT EDIT"
+CM_ "AUTOGENERATED FILE, DO NOT EDIT";
 
 
-CM_ "Imported file _bosch_2018.dbc starts here"
+CM_ "Imported file _bosch_2018.dbc starts here";
 VERSION ""
 
 
@@ -379,7 +379,7 @@ CM_ SG_ 577 LINE_DASHED "1 = line is dashed";
 CM_ SG_ 577 LINE_SOLID "1 = line is solid";
 VAL_ 399 STEER_STATUS 6 "tmp_fault" 5 "fault_1" 4 "no_torque_alert_2" 3 "low_speed_lockout" 2 "no_torque_alert_1" 0 "normal" ;
 
-CM_ "honda_civic_sedan_16_diesel_2019_can.dbc starts here"
+CM_ "honda_civic_sedan_16_diesel_2019_can.dbc starts here";
 
 
 BO_ 316 GAS_PEDAL_2: 8 XXX
diff --git a/honda_civic_touring_2016_can_generated.dbc b/honda_civic_touring_2016_can_generated.dbc
index 2617385..0d66633 100644
--- a/honda_civic_touring_2016_can_generated.dbc
+++ b/honda_civic_touring_2016_can_generated.dbc
@@ -1,7 +1,7 @@
-CM_ "AUTOGENERATED FILE, DO NOT EDIT"
+CM_ "AUTOGENERATED FILE, DO NOT EDIT";
 
 
-CM_ "Imported file _comma.dbc starts here"
+CM_ "Imported file _comma.dbc starts here";
 BO_ 512 GAS_COMMAND: 6 EON
  SG_ GAS_COMMAND : 7|16@0+ (0.253984064,-83.3) [0|1] "" INTERCEPTOR
  SG_ GAS_COMMAND2 : 23|16@0+ (0.126992032,-83.3) [0|1] "" INTERCEPTOR
@@ -19,7 +19,7 @@ BO_ 513 GAS_SENSOR: 6 INTERCEPTOR
 VAL_ 513 STATE 5 "FAULT_TIMEOUT" 4 "FAULT_STARTUP" 3 "FAULT_SCE" 2 "FAULT_SEND" 1 "FAULT_BAD_CHECKSUM" 0 "NO_FAULT" ;
 
 
-CM_ "Imported file _honda_2017.dbc starts here"
+CM_ "Imported file _honda_2017.dbc starts here";
 VERSION ""
 
 
@@ -251,7 +251,7 @@ VAL_ 780 CRUISE_SPEED 255 "no_speed" 252 "stopped" ;
 VAL_ 780 HUD_LEAD 3 "acc_off" 2 "solid_car" 1 "dashed_car" 0 "no_car" ;
 VAL_ 829 BEEP 3 "single_beep" 2 "triple_beep" 1 "repeated_beep" 0 "no_beep" ;
 
-CM_ "honda_civic_touring_2016_can.dbc starts here"
+CM_ "honda_civic_touring_2016_can.dbc starts here";
 
 
 
diff --git a/honda_clarity_hybrid_2018_can_generated.dbc b/honda_clarity_hybrid_2018_can_generated.dbc
index b5b8c7f..40775eb 100644
--- a/honda_clarity_hybrid_2018_can_generated.dbc
+++ b/honda_clarity_hybrid_2018_can_generated.dbc
@@ -1,7 +1,7 @@
-CM_ "AUTOGENERATED FILE, DO NOT EDIT"
+CM_ "AUTOGENERATED FILE, DO NOT EDIT";
 
 
-CM_ "Imported file _comma.dbc starts here"
+CM_ "Imported file _comma.dbc starts here";
 BO_ 512 GAS_COMMAND: 6 EON
  SG_ GAS_COMMAND : 7|16@0+ (0.253984064,-83.3) [0|1] "" INTERCEPTOR
  SG_ GAS_COMMAND2 : 23|16@0+ (0.126992032,-83.3) [0|1] "" INTERCEPTOR
@@ -19,7 +19,7 @@ BO_ 513 GAS_SENSOR: 6 INTERCEPTOR
 VAL_ 513 STATE 5 "FAULT_TIMEOUT" 4 "FAULT_STARTUP" 3 "FAULT_SCE" 2 "FAULT_SEND" 1 "FAULT_BAD_CHECKSUM" 0 "NO_FAULT" ;
 
 
-CM_ "Imported file _dual_can_nidec_2018.dbc starts here"
+CM_ "Imported file _dual_can_nidec_2018.dbc starts here";
 VERSION ""
 
 
@@ -251,7 +251,7 @@ VAL_ 780 CRUISE_SPEED 255 "no_speed" 252 "stopped" ;
 VAL_ 780 HUD_LEAD 3 "acc_off" 2 "solid_car" 1 "dashed_car" 0 "no_car" ;
 VAL_ 829 BEEP 3 "single_beep" 2 "triple_beep" 1 "repeated_beep" 0 "no_beep" ;
 
-CM_ "honda_clarity_hybrid_2018_can.dbc starts here"
+CM_ "honda_clarity_hybrid_2018_can.dbc starts here";
 
 
 
diff --git a/honda_crv_ex_2017_body_generated.dbc b/honda_crv_ex_2017_body_generated.dbc
index 9bf77b3..4d154e5 100644
--- a/honda_crv_ex_2017_body_generated.dbc
+++ b/honda_crv_ex_2017_body_generated.dbc
@@ -1,6 +1,6 @@
-CM_ "AUTOGENERATED FILE, DO NOT EDIT"
+CM_ "AUTOGENERATED FILE, DO NOT EDIT";
 
-CM_ "honda_crv_ex_2017_body.dbc starts here"
+CM_ "honda_crv_ex_2017_body.dbc starts here";
 BO_ 318291879 BSM_STATUS_RIGHT: 8 XXX
  SG_ BSM_ALERT : 4|1@0+ (1,0) [0|1] "" XXX
  SG_ BSM_MODE : 6|2@0+ (1,0) [0|3] "" XXX
diff --git a/honda_crv_ex_2017_can_generated.dbc b/honda_crv_ex_2017_can_generated.dbc
index f969655..2e6fbf8 100644
--- a/honda_crv_ex_2017_can_generated.dbc
+++ b/honda_crv_ex_2017_can_generated.dbc
@@ -1,7 +1,7 @@
-CM_ "AUTOGENERATED FILE, DO NOT EDIT"
+CM_ "AUTOGENERATED FILE, DO NOT EDIT";
 
 
-CM_ "Imported file _bosch_2018.dbc starts here"
+CM_ "Imported file _bosch_2018.dbc starts here";
 VERSION ""
 
 
@@ -379,7 +379,7 @@ CM_ SG_ 577 LINE_DASHED "1 = line is dashed";
 CM_ SG_ 577 LINE_SOLID "1 = line is solid";
 VAL_ 399 STEER_STATUS 6 "tmp_fault" 5 "fault_1" 4 "no_torque_alert_2" 3 "low_speed_lockout" 2 "no_torque_alert_1" 0 "normal" ;
 
-CM_ "honda_crv_ex_2017_can.dbc starts here"
+CM_ "honda_crv_ex_2017_can.dbc starts here";
 
 
 BO_ 304 GAS_PEDAL_2: 8 PCM
diff --git a/honda_crv_executive_2016_can_generated.dbc b/honda_crv_executive_2016_can_generated.dbc
index ce83841..7a7334c 100644
--- a/honda_crv_executive_2016_can_generated.dbc
+++ b/honda_crv_executive_2016_can_generated.dbc
@@ -1,7 +1,7 @@
-CM_ "AUTOGENERATED FILE, DO NOT EDIT"
+CM_ "AUTOGENERATED FILE, DO NOT EDIT";
 
 
-CM_ "Imported file _comma.dbc starts here"
+CM_ "Imported file _comma.dbc starts here";
 BO_ 512 GAS_COMMAND: 6 EON
  SG_ GAS_COMMAND : 7|16@0+ (0.253984064,-83.3) [0|1] "" INTERCEPTOR
  SG_ GAS_COMMAND2 : 23|16@0+ (0.126992032,-83.3) [0|1] "" INTERCEPTOR
@@ -19,7 +19,7 @@ BO_ 513 GAS_SENSOR: 6 INTERCEPTOR
 VAL_ 513 STATE 5 "FAULT_TIMEOUT" 4 "FAULT_STARTUP" 3 "FAULT_SCE" 2 "FAULT_SEND" 1 "FAULT_BAD_CHECKSUM" 0 "NO_FAULT" ;
 
 
-CM_ "Imported file _honda_2017.dbc starts here"
+CM_ "Imported file _honda_2017.dbc starts here";
 VERSION ""
 
 
@@ -251,7 +251,7 @@ VAL_ 780 CRUISE_SPEED 255 "no_speed" 252 "stopped" ;
 VAL_ 780 HUD_LEAD 3 "acc_off" 2 "solid_car" 1 "dashed_car" 0 "no_car" ;
 VAL_ 829 BEEP 3 "single_beep" 2 "triple_beep" 1 "repeated_beep" 0 "no_beep" ;
 
-CM_ "honda_crv_executive_2016_can.dbc starts here"
+CM_ "honda_crv_executive_2016_can.dbc starts here";
 
 
 
diff --git a/honda_crv_hybrid_2019_can_generated.dbc b/honda_crv_hybrid_2019_can_generated.dbc
index 3902cf2..e29d032 100644
--- a/honda_crv_hybrid_2019_can_generated.dbc
+++ b/honda_crv_hybrid_2019_can_generated.dbc
@@ -1,7 +1,7 @@
-CM_ "AUTOGENERATED FILE, DO NOT EDIT"
+CM_ "AUTOGENERATED FILE, DO NOT EDIT";
 
 
-CM_ "Imported file _bosch_2018.dbc starts here"
+CM_ "Imported file _bosch_2018.dbc starts here";
 VERSION ""
 
 
@@ -379,7 +379,7 @@ CM_ SG_ 577 LINE_DASHED "1 = line is dashed";
 CM_ SG_ 577 LINE_SOLID "1 = line is solid";
 VAL_ 399 STEER_STATUS 6 "tmp_fault" 5 "fault_1" 4 "no_torque_alert_2" 3 "low_speed_lockout" 2 "no_torque_alert_1" 0 "normal" ;
 
-CM_ "honda_crv_hybrid_2019_can.dbc starts here"
+CM_ "honda_crv_hybrid_2019_can.dbc starts here";
 
 
 BO_ 304 GAS_PEDAL_2: 8 PCM
diff --git a/honda_crv_touring_2016_can_generated.dbc b/honda_crv_touring_2016_can_generated.dbc
index 8730e03..a3d21d3 100644
--- a/honda_crv_touring_2016_can_generated.dbc
+++ b/honda_crv_touring_2016_can_generated.dbc
@@ -1,7 +1,7 @@
-CM_ "AUTOGENERATED FILE, DO NOT EDIT"
+CM_ "AUTOGENERATED FILE, DO NOT EDIT";
 
 
-CM_ "Imported file _comma.dbc starts here"
+CM_ "Imported file _comma.dbc starts here";
 BO_ 512 GAS_COMMAND: 6 EON
  SG_ GAS_COMMAND : 7|16@0+ (0.253984064,-83.3) [0|1] "" INTERCEPTOR
  SG_ GAS_COMMAND2 : 23|16@0+ (0.126992032,-83.3) [0|1] "" INTERCEPTOR
@@ -19,7 +19,7 @@ BO_ 513 GAS_SENSOR: 6 INTERCEPTOR
 VAL_ 513 STATE 5 "FAULT_TIMEOUT" 4 "FAULT_STARTUP" 3 "FAULT_SCE" 2 "FAULT_SEND" 1 "FAULT_BAD_CHECKSUM" 0 "NO_FAULT" ;
 
 
-CM_ "Imported file _honda_2017.dbc starts here"
+CM_ "Imported file _honda_2017.dbc starts here";
 VERSION ""
 
 
@@ -251,7 +251,7 @@ VAL_ 780 CRUISE_SPEED 255 "no_speed" 252 "stopped" ;
 VAL_ 780 HUD_LEAD 3 "acc_off" 2 "solid_car" 1 "dashed_car" 0 "no_car" ;
 VAL_ 829 BEEP 3 "single_beep" 2 "triple_beep" 1 "repeated_beep" 0 "no_beep" ;
 
-CM_ "honda_crv_touring_2016_can.dbc starts here"
+CM_ "honda_crv_touring_2016_can.dbc starts here";
 
 
 
diff --git a/honda_fit_ex_2018_can_generated.dbc b/honda_fit_ex_2018_can_generated.dbc
index a9cf3eb..3f2e2a1 100644
--- a/honda_fit_ex_2018_can_generated.dbc
+++ b/honda_fit_ex_2018_can_generated.dbc
@@ -1,7 +1,7 @@
-CM_ "AUTOGENERATED FILE, DO NOT EDIT"
+CM_ "AUTOGENERATED FILE, DO NOT EDIT";
 
 
-CM_ "Imported file _comma.dbc starts here"
+CM_ "Imported file _comma.dbc starts here";
 BO_ 512 GAS_COMMAND: 6 EON
  SG_ GAS_COMMAND : 7|16@0+ (0.253984064,-83.3) [0|1] "" INTERCEPTOR
  SG_ GAS_COMMAND2 : 23|16@0+ (0.126992032,-83.3) [0|1] "" INTERCEPTOR
@@ -19,7 +19,7 @@ BO_ 513 GAS_SENSOR: 6 INTERCEPTOR
 VAL_ 513 STATE 5 "FAULT_TIMEOUT" 4 "FAULT_STARTUP" 3 "FAULT_SCE" 2 "FAULT_SEND" 1 "FAULT_BAD_CHECKSUM" 0 "NO_FAULT" ;
 
 
-CM_ "Imported file _honda_2017.dbc starts here"
+CM_ "Imported file _honda_2017.dbc starts here";
 VERSION ""
 
 
@@ -251,7 +251,7 @@ VAL_ 780 CRUISE_SPEED 255 "no_speed" 252 "stopped" ;
 VAL_ 780 HUD_LEAD 3 "acc_off" 2 "solid_car" 1 "dashed_car" 0 "no_car" ;
 VAL_ 829 BEEP 3 "single_beep" 2 "triple_beep" 1 "repeated_beep" 0 "no_beep" ;
 
-CM_ "honda_fit_ex_2018_can.dbc starts here"
+CM_ "honda_fit_ex_2018_can.dbc starts here";
 
 
 
diff --git a/honda_fit_hybrid_2018_can_generated.dbc b/honda_fit_hybrid_2018_can_generated.dbc
index af7e137..a75fcf7 100644
--- a/honda_fit_hybrid_2018_can_generated.dbc
+++ b/honda_fit_hybrid_2018_can_generated.dbc
@@ -1,7 +1,7 @@
-CM_ "AUTOGENERATED FILE, DO NOT EDIT"
+CM_ "AUTOGENERATED FILE, DO NOT EDIT";
 
 
-CM_ "Imported file _comma.dbc starts here"
+CM_ "Imported file _comma.dbc starts here";
 BO_ 512 GAS_COMMAND: 6 EON
  SG_ GAS_COMMAND : 7|16@0+ (0.253984064,-83.3) [0|1] "" INTERCEPTOR
  SG_ GAS_COMMAND2 : 23|16@0+ (0.126992032,-83.3) [0|1] "" INTERCEPTOR
@@ -19,7 +19,7 @@ BO_ 513 GAS_SENSOR: 6 INTERCEPTOR
 VAL_ 513 STATE 5 "FAULT_TIMEOUT" 4 "FAULT_STARTUP" 3 "FAULT_SCE" 2 "FAULT_SEND" 1 "FAULT_BAD_CHECKSUM" 0 "NO_FAULT" ;
 
 
-CM_ "Imported file _dual_can_nidec_2018.dbc starts here"
+CM_ "Imported file _dual_can_nidec_2018.dbc starts here";
 VERSION ""
 
 
@@ -251,7 +251,7 @@ VAL_ 780 CRUISE_SPEED 255 "no_speed" 252 "stopped" ;
 VAL_ 780 HUD_LEAD 3 "acc_off" 2 "solid_car" 1 "dashed_car" 0 "no_car" ;
 VAL_ 829 BEEP 3 "single_beep" 2 "triple_beep" 1 "repeated_beep" 0 "no_beep" ;
 
-CM_ "honda_fit_hybrid_2018_can.dbc starts here"
+CM_ "honda_fit_hybrid_2018_can.dbc starts here";
 
 
 
diff --git a/honda_hrv_touring_2019_can_generated.dbc b/honda_hrv_touring_2019_can_generated.dbc
index d5ca796..5aea74b 100644
--- a/honda_hrv_touring_2019_can_generated.dbc
+++ b/honda_hrv_touring_2019_can_generated.dbc
@@ -1,7 +1,7 @@
-CM_ "AUTOGENERATED FILE, DO NOT EDIT"
+CM_ "AUTOGENERATED FILE, DO NOT EDIT";
 
 
-CM_ "Imported file _comma.dbc starts here"
+CM_ "Imported file _comma.dbc starts here";
 BO_ 512 GAS_COMMAND: 6 EON
  SG_ GAS_COMMAND : 7|16@0+ (0.253984064,-83.3) [0|1] "" INTERCEPTOR
  SG_ GAS_COMMAND2 : 23|16@0+ (0.126992032,-83.3) [0|1] "" INTERCEPTOR
@@ -19,7 +19,7 @@ BO_ 513 GAS_SENSOR: 6 INTERCEPTOR
 VAL_ 513 STATE 5 "FAULT_TIMEOUT" 4 "FAULT_STARTUP" 3 "FAULT_SCE" 2 "FAULT_SEND" 1 "FAULT_BAD_CHECKSUM" 0 "NO_FAULT" ;
 
 
-CM_ "Imported file _honda_2017.dbc starts here"
+CM_ "Imported file _honda_2017.dbc starts here";
 VERSION ""
 
 
@@ -251,7 +251,7 @@ VAL_ 780 CRUISE_SPEED 255 "no_speed" 252 "stopped" ;
 VAL_ 780 HUD_LEAD 3 "acc_off" 2 "solid_car" 1 "dashed_car" 0 "no_car" ;
 VAL_ 829 BEEP 3 "single_beep" 2 "triple_beep" 1 "repeated_beep" 0 "no_beep" ;
 
-CM_ "honda_hrv_touring_2019_can.dbc starts here"
+CM_ "honda_hrv_touring_2019_can.dbc starts here";
 
 
 
diff --git a/honda_insight_ex_2019_can_generated.dbc b/honda_insight_ex_2019_can_generated.dbc
index 8d8d034..7287af2 100644
--- a/honda_insight_ex_2019_can_generated.dbc
+++ b/honda_insight_ex_2019_can_generated.dbc
@@ -1,7 +1,7 @@
-CM_ "AUTOGENERATED FILE, DO NOT EDIT"
+CM_ "AUTOGENERATED FILE, DO NOT EDIT";
 
 
-CM_ "Imported file _bosch_2018.dbc starts here"
+CM_ "Imported file _bosch_2018.dbc starts here";
 VERSION ""
 
 
@@ -379,7 +379,7 @@ CM_ SG_ 577 LINE_DASHED "1 = line is dashed";
 CM_ SG_ 577 LINE_SOLID "1 = line is solid";
 VAL_ 399 STEER_STATUS 6 "tmp_fault" 5 "fault_1" 4 "no_torque_alert_2" 3 "low_speed_lockout" 2 "no_torque_alert_1" 0 "normal" ;
 
-CM_ "honda_insight_ex_2019_can.dbc starts here"
+CM_ "honda_insight_ex_2019_can.dbc starts here";
 
 
 BO_ 304 GAS_PEDAL_2: 8 PCM
diff --git a/honda_odyssey_exl_2018_generated.dbc b/honda_odyssey_exl_2018_generated.dbc
index 36af55b..7c7526f 100644
--- a/honda_odyssey_exl_2018_generated.dbc
+++ b/honda_odyssey_exl_2018_generated.dbc
@@ -1,7 +1,7 @@
-CM_ "AUTOGENERATED FILE, DO NOT EDIT"
+CM_ "AUTOGENERATED FILE, DO NOT EDIT";
 
 
-CM_ "Imported file _comma.dbc starts here"
+CM_ "Imported file _comma.dbc starts here";
 BO_ 512 GAS_COMMAND: 6 EON
  SG_ GAS_COMMAND : 7|16@0+ (0.253984064,-83.3) [0|1] "" INTERCEPTOR
  SG_ GAS_COMMAND2 : 23|16@0+ (0.126992032,-83.3) [0|1] "" INTERCEPTOR
@@ -19,7 +19,7 @@ BO_ 513 GAS_SENSOR: 6 INTERCEPTOR
 VAL_ 513 STATE 5 "FAULT_TIMEOUT" 4 "FAULT_STARTUP" 3 "FAULT_SCE" 2 "FAULT_SEND" 1 "FAULT_BAD_CHECKSUM" 0 "NO_FAULT" ;
 
 
-CM_ "Imported file _honda_2017.dbc starts here"
+CM_ "Imported file _honda_2017.dbc starts here";
 VERSION ""
 
 
@@ -251,7 +251,7 @@ VAL_ 780 CRUISE_SPEED 255 "no_speed" 252 "stopped" ;
 VAL_ 780 HUD_LEAD 3 "acc_off" 2 "solid_car" 1 "dashed_car" 0 "no_car" ;
 VAL_ 829 BEEP 3 "single_beep" 2 "triple_beep" 1 "repeated_beep" 0 "no_beep" ;
 
-CM_ "honda_odyssey_exl_2018.dbc starts here"
+CM_ "honda_odyssey_exl_2018.dbc starts here";
 
 
 
diff --git a/honda_odyssey_extreme_edition_2018_china_can_generated.dbc b/honda_odyssey_extreme_edition_2018_china_can_generated.dbc
index 3c5a88a..b5422c0 100644
--- a/honda_odyssey_extreme_edition_2018_china_can_generated.dbc
+++ b/honda_odyssey_extreme_edition_2018_china_can_generated.dbc
@@ -1,7 +1,7 @@
-CM_ "AUTOGENERATED FILE, DO NOT EDIT"
+CM_ "AUTOGENERATED FILE, DO NOT EDIT";
 
 
-CM_ "Imported file _comma.dbc starts here"
+CM_ "Imported file _comma.dbc starts here";
 BO_ 512 GAS_COMMAND: 6 EON
  SG_ GAS_COMMAND : 7|16@0+ (0.253984064,-83.3) [0|1] "" INTERCEPTOR
  SG_ GAS_COMMAND2 : 23|16@0+ (0.126992032,-83.3) [0|1] "" INTERCEPTOR
@@ -19,7 +19,7 @@ BO_ 513 GAS_SENSOR: 6 INTERCEPTOR
 VAL_ 513 STATE 5 "FAULT_TIMEOUT" 4 "FAULT_STARTUP" 3 "FAULT_SCE" 2 "FAULT_SEND" 1 "FAULT_BAD_CHECKSUM" 0 "NO_FAULT" ;
 
 
-CM_ "Imported file _honda_2017.dbc starts here"
+CM_ "Imported file _honda_2017.dbc starts here";
 VERSION ""
 
 
@@ -251,7 +251,7 @@ VAL_ 780 CRUISE_SPEED 255 "no_speed" 252 "stopped" ;
 VAL_ 780 HUD_LEAD 3 "acc_off" 2 "solid_car" 1 "dashed_car" 0 "no_car" ;
 VAL_ 829 BEEP 3 "single_beep" 2 "triple_beep" 1 "repeated_beep" 0 "no_beep" ;
 
-CM_ "honda_odyssey_extreme_edition_2018_china_can.dbc starts here"
+CM_ "honda_odyssey_extreme_edition_2018_china_can.dbc starts here";
 
 
 
diff --git a/honda_pilot_touring_2017_can_generated.dbc b/honda_pilot_touring_2017_can_generated.dbc
index 1f82213..9cca249 100644
--- a/honda_pilot_touring_2017_can_generated.dbc
+++ b/honda_pilot_touring_2017_can_generated.dbc
@@ -1,7 +1,7 @@
-CM_ "AUTOGENERATED FILE, DO NOT EDIT"
+CM_ "AUTOGENERATED FILE, DO NOT EDIT";
 
 
-CM_ "Imported file _comma.dbc starts here"
+CM_ "Imported file _comma.dbc starts here";
 BO_ 512 GAS_COMMAND: 6 EON
  SG_ GAS_COMMAND : 7|16@0+ (0.253984064,-83.3) [0|1] "" INTERCEPTOR
  SG_ GAS_COMMAND2 : 23|16@0+ (0.126992032,-83.3) [0|1] "" INTERCEPTOR
@@ -19,7 +19,7 @@ BO_ 513 GAS_SENSOR: 6 INTERCEPTOR
 VAL_ 513 STATE 5 "FAULT_TIMEOUT" 4 "FAULT_STARTUP" 3 "FAULT_SCE" 2 "FAULT_SEND" 1 "FAULT_BAD_CHECKSUM" 0 "NO_FAULT" ;
 
 
-CM_ "Imported file _honda_2017.dbc starts here"
+CM_ "Imported file _honda_2017.dbc starts here";
 VERSION ""
 
 
@@ -251,7 +251,7 @@ VAL_ 780 CRUISE_SPEED 255 "no_speed" 252 "stopped" ;
 VAL_ 780 HUD_LEAD 3 "acc_off" 2 "solid_car" 1 "dashed_car" 0 "no_car" ;
 VAL_ 829 BEEP 3 "single_beep" 2 "triple_beep" 1 "repeated_beep" 0 "no_beep" ;
 
-CM_ "honda_pilot_touring_2017_can.dbc starts here"
+CM_ "honda_pilot_touring_2017_can.dbc starts here";
 
 
 
diff --git a/honda_ridgeline_black_edition_2017_can_generated.dbc b/honda_ridgeline_black_edition_2017_can_generated.dbc
index cdfb231..0c04d91 100644
--- a/honda_ridgeline_black_edition_2017_can_generated.dbc
+++ b/honda_ridgeline_black_edition_2017_can_generated.dbc
@@ -1,7 +1,7 @@
-CM_ "AUTOGENERATED FILE, DO NOT EDIT"
+CM_ "AUTOGENERATED FILE, DO NOT EDIT";
 
 
-CM_ "Imported file _comma.dbc starts here"
+CM_ "Imported file _comma.dbc starts here";
 BO_ 512 GAS_COMMAND: 6 EON
  SG_ GAS_COMMAND : 7|16@0+ (0.253984064,-83.3) [0|1] "" INTERCEPTOR
  SG_ GAS_COMMAND2 : 23|16@0+ (0.126992032,-83.3) [0|1] "" INTERCEPTOR
@@ -19,7 +19,7 @@ BO_ 513 GAS_SENSOR: 6 INTERCEPTOR
 VAL_ 513 STATE 5 "FAULT_TIMEOUT" 4 "FAULT_STARTUP" 3 "FAULT_SCE" 2 "FAULT_SEND" 1 "FAULT_BAD_CHECKSUM" 0 "NO_FAULT" ;
 
 
-CM_ "Imported file _honda_2017.dbc starts here"
+CM_ "Imported file _honda_2017.dbc starts here";
 VERSION ""
 
 
@@ -251,7 +251,7 @@ VAL_ 780 CRUISE_SPEED 255 "no_speed" 252 "stopped" ;
 VAL_ 780 HUD_LEAD 3 "acc_off" 2 "solid_car" 1 "dashed_car" 0 "no_car" ;
 VAL_ 829 BEEP 3 "single_beep" 2 "triple_beep" 1 "repeated_beep" 0 "no_beep" ;
 
-CM_ "honda_ridgeline_black_edition_2017_can.dbc starts here"
+CM_ "honda_ridgeline_black_edition_2017_can.dbc starts here";
 
 
 
diff --git a/lexus_ct200h_2018_pt_generated.dbc b/lexus_ct200h_2018_pt_generated.dbc
index e656265..6c1622f 100644
--- a/lexus_ct200h_2018_pt_generated.dbc
+++ b/lexus_ct200h_2018_pt_generated.dbc
@@ -1,7 +1,7 @@
-CM_ "AUTOGENERATED FILE, DO NOT EDIT"
+CM_ "AUTOGENERATED FILE, DO NOT EDIT";
 
 
-CM_ "Imported file _comma.dbc starts here"
+CM_ "Imported file _comma.dbc starts here";
 BO_ 359 STEERING_IPAS_COMMA: 8 IPAS
  SG_ STATE : 7|4@0+ (1,0) [0|15] "" XXX
  SG_ ANGLE : 3|12@0- (1.5,0) [-510|510] "deg" XXX
@@ -12,7 +12,7 @@ BO_ 359 STEERING_IPAS_COMMA: 8 IPAS
  SG_ SET_ME_X00 : 55|8@0+ (1,0) [0|255] "" XXX
  SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
 
-CM BO_ STEERING_IPAS_COMMA "Copy of msg 614 so we can do angle control while the Park Assist ECU is connected (Panda spoofs 614 with 359 on connector J70). Note that addresses 0x266 and 0x167 are checksum-invariant";
+CM_ "BO_ STEERING_IPAS_COMMA: Copy of msg 614 so we can do angle control while the Park Assist ECU is connected (Panda spoofs 614 with 359 on connector J70). Note that addresses 0x266 and 0x167 are checksum-invariant";
 
  BO_ 512 GAS_COMMAND: 6 EON
   SG_ GAS_COMMAND : 7|16@0+ (0.159375,-75.555) [0|1] "" INTERCEPTOR
@@ -33,10 +33,10 @@ CM BO_ STEERING_IPAS_COMMA "Copy of msg 614 so we can do angle control while the
 BO_ 35 SECONDARY_STEER_ANGLE: 8 XXX
  SG_ ZORRO_STEER : 7|24@0- (0.004901594652,0) [-500|500] "" XXX
 
-CM BO_ SECONDARY_STEER_ANGLE "ZSS is a high-precision steering angle sensor that can replace the lower resolution sensor in most TSS1 Toyotas. Learn more: https://github.com/commaai/openpilot/wiki/Toyota-Lexus#zorro-steering-sensor-zss";
+CM_ "BO_ SECONDARY_STEER_ANGLE: ZSS is a high-precision steering angle sensor that can replace the lower resolution sensor in most TSS1 Toyotas. Learn more: https://github.com/commaai/openpilot/wiki/Toyota-Lexus#zorro-steering-sensor-zss";
 
 
-CM_ "Imported file _toyota_2017.dbc starts here"
+CM_ "Imported file _toyota_2017.dbc starts here";
 VERSION ""
 
 
@@ -325,7 +325,7 @@ CM_ SG_ 614 ANGLE "set to measured angle when ipas control isn't active";
 CM_ SG_ 643 COUNTER "only used on cars that use this msg for cruise control";
 CM_ SG_ 643 BRAKE_STATUS "only used on cars that use this msg for cruise control";
 CM_ SG_ 643 PRECOLLISION_ACTIVE "set 0.5s before any braking";
-CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was "SET_ME_1" and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG.";
+CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was 'SET_ME_1' and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG.";
 CM_ SG_ 835 ACCEL_CMD_ALT "Copy of main ACCEL_CMD, but across 8 bits instead of 16 bits like ACCEL_CMD. Unsure if only informational or has an effect. Likely informational as existing openpilot sets this to 0 and no loss of functionality observed. Originally 'AT_RAW' in leaked toyota_2017_ref_pt.dbc file.";
 CM_ SG_ 921 UI_SET_SPEED "set speed shown in UI with user set unit";
 CM_ SG_ 951 BRAKE_LIGHTS_ACC "brake lights when ACC commands decel";
@@ -333,7 +333,7 @@ CM_ SG_ 1042 SET_ME_1 "unclear what this is, but it's always 1 in drive traces";
 CM_ SG_ 1042 REPEATED_BEEPS "recommended for fcw and other important alerts";
 CM_ SG_ 1161 SPDVAL1 "Numbers 0-199 is displayed, 200-254 displays circle without number and 255 is for no limit.";
 CM_ SG_ 1161 SYNCID1 "counter from 1 to f at 1 Hz";
-CM_ SG_ 1161 SPDVAL2 "conditional speed value 70"
+CM_ SG_ 1161 SPDVAL2 "conditional speed value 70";
 CM_ SG_ 1162 SGNNUMP "1 if SPDVAL1 is set, otherwise 0";
 CM_ SG_ 1162 SYNCID2 "counter from 1 to f at 1 Hz";
 CM_ SG_ 1163 TSREQPD "always 1";
@@ -367,7 +367,7 @@ VAL_ 1162 SPLSGN3 15 "conditional blank" 4 "wet road" 5 "rain" 0 "none";
 
 CM_ "CHFFR_METRIC 37 STEER_ANGLE STEER_ANGLE 0.36 180";
 
-CM_ "lexus_ct200h_2018_pt.dbc starts here"
+CM_ "lexus_ct200h_2018_pt.dbc starts here";
 
 
 
diff --git a/lexus_gs300h_2017_pt_generated.dbc b/lexus_gs300h_2017_pt_generated.dbc
index 2594675..aa17654 100644
--- a/lexus_gs300h_2017_pt_generated.dbc
+++ b/lexus_gs300h_2017_pt_generated.dbc
@@ -1,7 +1,7 @@
-CM_ "AUTOGENERATED FILE, DO NOT EDIT"
+CM_ "AUTOGENERATED FILE, DO NOT EDIT";
 
 
-CM_ "Imported file _comma.dbc starts here"
+CM_ "Imported file _comma.dbc starts here";
 BO_ 359 STEERING_IPAS_COMMA: 8 IPAS
  SG_ STATE : 7|4@0+ (1,0) [0|15] "" XXX
  SG_ ANGLE : 3|12@0- (1.5,0) [-510|510] "deg" XXX
@@ -12,7 +12,7 @@ BO_ 359 STEERING_IPAS_COMMA: 8 IPAS
  SG_ SET_ME_X00 : 55|8@0+ (1,0) [0|255] "" XXX
  SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
 
-CM BO_ STEERING_IPAS_COMMA "Copy of msg 614 so we can do angle control while the Park Assist ECU is connected (Panda spoofs 614 with 359 on connector J70). Note that addresses 0x266 and 0x167 are checksum-invariant";
+CM_ "BO_ STEERING_IPAS_COMMA: Copy of msg 614 so we can do angle control while the Park Assist ECU is connected (Panda spoofs 614 with 359 on connector J70). Note that addresses 0x266 and 0x167 are checksum-invariant";
 
  BO_ 512 GAS_COMMAND: 6 EON
   SG_ GAS_COMMAND : 7|16@0+ (0.159375,-75.555) [0|1] "" INTERCEPTOR
@@ -33,10 +33,10 @@ CM BO_ STEERING_IPAS_COMMA "Copy of msg 614 so we can do angle control while the
 BO_ 35 SECONDARY_STEER_ANGLE: 8 XXX
  SG_ ZORRO_STEER : 7|24@0- (0.004901594652,0) [-500|500] "" XXX
 
-CM BO_ SECONDARY_STEER_ANGLE "ZSS is a high-precision steering angle sensor that can replace the lower resolution sensor in most TSS1 Toyotas. Learn more: https://github.com/commaai/openpilot/wiki/Toyota-Lexus#zorro-steering-sensor-zss";
+CM_ "BO_ SECONDARY_STEER_ANGLE: ZSS is a high-precision steering angle sensor that can replace the lower resolution sensor in most TSS1 Toyotas. Learn more: https://github.com/commaai/openpilot/wiki/Toyota-Lexus#zorro-steering-sensor-zss";
 
 
-CM_ "Imported file _toyota_2017.dbc starts here"
+CM_ "Imported file _toyota_2017.dbc starts here";
 VERSION ""
 
 
@@ -325,7 +325,7 @@ CM_ SG_ 614 ANGLE "set to measured angle when ipas control isn't active";
 CM_ SG_ 643 COUNTER "only used on cars that use this msg for cruise control";
 CM_ SG_ 643 BRAKE_STATUS "only used on cars that use this msg for cruise control";
 CM_ SG_ 643 PRECOLLISION_ACTIVE "set 0.5s before any braking";
-CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was "SET_ME_1" and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG.";
+CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was 'SET_ME_1' and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG.";
 CM_ SG_ 835 ACCEL_CMD_ALT "Copy of main ACCEL_CMD, but across 8 bits instead of 16 bits like ACCEL_CMD. Unsure if only informational or has an effect. Likely informational as existing openpilot sets this to 0 and no loss of functionality observed. Originally 'AT_RAW' in leaked toyota_2017_ref_pt.dbc file.";
 CM_ SG_ 921 UI_SET_SPEED "set speed shown in UI with user set unit";
 CM_ SG_ 951 BRAKE_LIGHTS_ACC "brake lights when ACC commands decel";
@@ -333,7 +333,7 @@ CM_ SG_ 1042 SET_ME_1 "unclear what this is, but it's always 1 in drive traces";
 CM_ SG_ 1042 REPEATED_BEEPS "recommended for fcw and other important alerts";
 CM_ SG_ 1161 SPDVAL1 "Numbers 0-199 is displayed, 200-254 displays circle without number and 255 is for no limit.";
 CM_ SG_ 1161 SYNCID1 "counter from 1 to f at 1 Hz";
-CM_ SG_ 1161 SPDVAL2 "conditional speed value 70"
+CM_ SG_ 1161 SPDVAL2 "conditional speed value 70";
 CM_ SG_ 1162 SGNNUMP "1 if SPDVAL1 is set, otherwise 0";
 CM_ SG_ 1162 SYNCID2 "counter from 1 to f at 1 Hz";
 CM_ SG_ 1163 TSREQPD "always 1";
@@ -367,7 +367,7 @@ VAL_ 1162 SPLSGN3 15 "conditional blank" 4 "wet road" 5 "rain" 0 "none";
 
 CM_ "CHFFR_METRIC 37 STEER_ANGLE STEER_ANGLE 0.36 180";
 
-CM_ "lexus_gs300h_2017_pt.dbc starts here"
+CM_ "lexus_gs300h_2017_pt.dbc starts here";
 
 
 
diff --git a/lexus_is_2018_pt_generated.dbc b/lexus_is_2018_pt_generated.dbc
index bd6e4e9..50ce613 100644
--- a/lexus_is_2018_pt_generated.dbc
+++ b/lexus_is_2018_pt_generated.dbc
@@ -1,7 +1,7 @@
-CM_ "AUTOGENERATED FILE, DO NOT EDIT"
+CM_ "AUTOGENERATED FILE, DO NOT EDIT";
 
 
-CM_ "Imported file _comma.dbc starts here"
+CM_ "Imported file _comma.dbc starts here";
 BO_ 359 STEERING_IPAS_COMMA: 8 IPAS
  SG_ STATE : 7|4@0+ (1,0) [0|15] "" XXX
  SG_ ANGLE : 3|12@0- (1.5,0) [-510|510] "deg" XXX
@@ -12,7 +12,7 @@ BO_ 359 STEERING_IPAS_COMMA: 8 IPAS
  SG_ SET_ME_X00 : 55|8@0+ (1,0) [0|255] "" XXX
  SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
 
-CM BO_ STEERING_IPAS_COMMA "Copy of msg 614 so we can do angle control while the Park Assist ECU is connected (Panda spoofs 614 with 359 on connector J70). Note that addresses 0x266 and 0x167 are checksum-invariant";
+CM_ "BO_ STEERING_IPAS_COMMA: Copy of msg 614 so we can do angle control while the Park Assist ECU is connected (Panda spoofs 614 with 359 on connector J70). Note that addresses 0x266 and 0x167 are checksum-invariant";
 
  BO_ 512 GAS_COMMAND: 6 EON
   SG_ GAS_COMMAND : 7|16@0+ (0.159375,-75.555) [0|1] "" INTERCEPTOR
@@ -33,10 +33,10 @@ CM BO_ STEERING_IPAS_COMMA "Copy of msg 614 so we can do angle control while the
 BO_ 35 SECONDARY_STEER_ANGLE: 8 XXX
  SG_ ZORRO_STEER : 7|24@0- (0.004901594652,0) [-500|500] "" XXX
 
-CM BO_ SECONDARY_STEER_ANGLE "ZSS is a high-precision steering angle sensor that can replace the lower resolution sensor in most TSS1 Toyotas. Learn more: https://github.com/commaai/openpilot/wiki/Toyota-Lexus#zorro-steering-sensor-zss";
+CM_ "BO_ SECONDARY_STEER_ANGLE: ZSS is a high-precision steering angle sensor that can replace the lower resolution sensor in most TSS1 Toyotas. Learn more: https://github.com/commaai/openpilot/wiki/Toyota-Lexus#zorro-steering-sensor-zss";
 
 
-CM_ "Imported file _toyota_2017.dbc starts here"
+CM_ "Imported file _toyota_2017.dbc starts here";
 VERSION ""
 
 
@@ -325,7 +325,7 @@ CM_ SG_ 614 ANGLE "set to measured angle when ipas control isn't active";
 CM_ SG_ 643 COUNTER "only used on cars that use this msg for cruise control";
 CM_ SG_ 643 BRAKE_STATUS "only used on cars that use this msg for cruise control";
 CM_ SG_ 643 PRECOLLISION_ACTIVE "set 0.5s before any braking";
-CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was "SET_ME_1" and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG.";
+CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was 'SET_ME_1' and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG.";
 CM_ SG_ 835 ACCEL_CMD_ALT "Copy of main ACCEL_CMD, but across 8 bits instead of 16 bits like ACCEL_CMD. Unsure if only informational or has an effect. Likely informational as existing openpilot sets this to 0 and no loss of functionality observed. Originally 'AT_RAW' in leaked toyota_2017_ref_pt.dbc file.";
 CM_ SG_ 921 UI_SET_SPEED "set speed shown in UI with user set unit";
 CM_ SG_ 951 BRAKE_LIGHTS_ACC "brake lights when ACC commands decel";
@@ -333,7 +333,7 @@ CM_ SG_ 1042 SET_ME_1 "unclear what this is, but it's always 1 in drive traces";
 CM_ SG_ 1042 REPEATED_BEEPS "recommended for fcw and other important alerts";
 CM_ SG_ 1161 SPDVAL1 "Numbers 0-199 is displayed, 200-254 displays circle without number and 255 is for no limit.";
 CM_ SG_ 1161 SYNCID1 "counter from 1 to f at 1 Hz";
-CM_ SG_ 1161 SPDVAL2 "conditional speed value 70"
+CM_ SG_ 1161 SPDVAL2 "conditional speed value 70";
 CM_ SG_ 1162 SGNNUMP "1 if SPDVAL1 is set, otherwise 0";
 CM_ SG_ 1162 SYNCID2 "counter from 1 to f at 1 Hz";
 CM_ SG_ 1163 TSREQPD "always 1";
@@ -367,7 +367,7 @@ VAL_ 1162 SPLSGN3 15 "conditional blank" 4 "wet road" 5 "rain" 0 "none";
 
 CM_ "CHFFR_METRIC 37 STEER_ANGLE STEER_ANGLE 0.36 180";
 
-CM_ "lexus_is_2018_pt.dbc starts here"
+CM_ "lexus_is_2018_pt.dbc starts here";
 
 
 
diff --git a/lexus_nx300_2018_pt_generated.dbc b/lexus_nx300_2018_pt_generated.dbc
index 02db9c9..ba0eee0 100644
--- a/lexus_nx300_2018_pt_generated.dbc
+++ b/lexus_nx300_2018_pt_generated.dbc
@@ -1,7 +1,7 @@
-CM_ "AUTOGENERATED FILE, DO NOT EDIT"
+CM_ "AUTOGENERATED FILE, DO NOT EDIT";
 
 
-CM_ "Imported file _comma.dbc starts here"
+CM_ "Imported file _comma.dbc starts here";
 BO_ 359 STEERING_IPAS_COMMA: 8 IPAS
  SG_ STATE : 7|4@0+ (1,0) [0|15] "" XXX
  SG_ ANGLE : 3|12@0- (1.5,0) [-510|510] "deg" XXX
@@ -12,7 +12,7 @@ BO_ 359 STEERING_IPAS_COMMA: 8 IPAS
  SG_ SET_ME_X00 : 55|8@0+ (1,0) [0|255] "" XXX
  SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
 
-CM BO_ STEERING_IPAS_COMMA "Copy of msg 614 so we can do angle control while the Park Assist ECU is connected (Panda spoofs 614 with 359 on connector J70). Note that addresses 0x266 and 0x167 are checksum-invariant";
+CM_ "BO_ STEERING_IPAS_COMMA: Copy of msg 614 so we can do angle control while the Park Assist ECU is connected (Panda spoofs 614 with 359 on connector J70). Note that addresses 0x266 and 0x167 are checksum-invariant";
 
  BO_ 512 GAS_COMMAND: 6 EON
   SG_ GAS_COMMAND : 7|16@0+ (0.159375,-75.555) [0|1] "" INTERCEPTOR
@@ -33,10 +33,10 @@ CM BO_ STEERING_IPAS_COMMA "Copy of msg 614 so we can do angle control while the
 BO_ 35 SECONDARY_STEER_ANGLE: 8 XXX
  SG_ ZORRO_STEER : 7|24@0- (0.004901594652,0) [-500|500] "" XXX
 
-CM BO_ SECONDARY_STEER_ANGLE "ZSS is a high-precision steering angle sensor that can replace the lower resolution sensor in most TSS1 Toyotas. Learn more: https://github.com/commaai/openpilot/wiki/Toyota-Lexus#zorro-steering-sensor-zss";
+CM_ "BO_ SECONDARY_STEER_ANGLE: ZSS is a high-precision steering angle sensor that can replace the lower resolution sensor in most TSS1 Toyotas. Learn more: https://github.com/commaai/openpilot/wiki/Toyota-Lexus#zorro-steering-sensor-zss";
 
 
-CM_ "Imported file _toyota_2017.dbc starts here"
+CM_ "Imported file _toyota_2017.dbc starts here";
 VERSION ""
 
 
@@ -325,7 +325,7 @@ CM_ SG_ 614 ANGLE "set to measured angle when ipas control isn't active";
 CM_ SG_ 643 COUNTER "only used on cars that use this msg for cruise control";
 CM_ SG_ 643 BRAKE_STATUS "only used on cars that use this msg for cruise control";
 CM_ SG_ 643 PRECOLLISION_ACTIVE "set 0.5s before any braking";
-CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was "SET_ME_1" and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG.";
+CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was 'SET_ME_1' and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG.";
 CM_ SG_ 835 ACCEL_CMD_ALT "Copy of main ACCEL_CMD, but across 8 bits instead of 16 bits like ACCEL_CMD. Unsure if only informational or has an effect. Likely informational as existing openpilot sets this to 0 and no loss of functionality observed. Originally 'AT_RAW' in leaked toyota_2017_ref_pt.dbc file.";
 CM_ SG_ 921 UI_SET_SPEED "set speed shown in UI with user set unit";
 CM_ SG_ 951 BRAKE_LIGHTS_ACC "brake lights when ACC commands decel";
@@ -333,7 +333,7 @@ CM_ SG_ 1042 SET_ME_1 "unclear what this is, but it's always 1 in drive traces";
 CM_ SG_ 1042 REPEATED_BEEPS "recommended for fcw and other important alerts";
 CM_ SG_ 1161 SPDVAL1 "Numbers 0-199 is displayed, 200-254 displays circle without number and 255 is for no limit.";
 CM_ SG_ 1161 SYNCID1 "counter from 1 to f at 1 Hz";
-CM_ SG_ 1161 SPDVAL2 "conditional speed value 70"
+CM_ SG_ 1161 SPDVAL2 "conditional speed value 70";
 CM_ SG_ 1162 SGNNUMP "1 if SPDVAL1 is set, otherwise 0";
 CM_ SG_ 1162 SYNCID2 "counter from 1 to f at 1 Hz";
 CM_ SG_ 1163 TSREQPD "always 1";
@@ -367,7 +367,7 @@ VAL_ 1162 SPLSGN3 15 "conditional blank" 4 "wet road" 5 "rain" 0 "none";
 
 CM_ "CHFFR_METRIC 37 STEER_ANGLE STEER_ANGLE 0.36 180";
 
-CM_ "lexus_nx300_2018_pt.dbc starts here"
+CM_ "lexus_nx300_2018_pt.dbc starts here";
 
 
 
diff --git a/lexus_nx300h_2018_pt_generated.dbc b/lexus_nx300h_2018_pt_generated.dbc
index f774bd5..bbc80d2 100644
--- a/lexus_nx300h_2018_pt_generated.dbc
+++ b/lexus_nx300h_2018_pt_generated.dbc
@@ -1,7 +1,7 @@
-CM_ "AUTOGENERATED FILE, DO NOT EDIT"
+CM_ "AUTOGENERATED FILE, DO NOT EDIT";
 
 
-CM_ "Imported file _comma.dbc starts here"
+CM_ "Imported file _comma.dbc starts here";
 BO_ 359 STEERING_IPAS_COMMA: 8 IPAS
  SG_ STATE : 7|4@0+ (1,0) [0|15] "" XXX
  SG_ ANGLE : 3|12@0- (1.5,0) [-510|510] "deg" XXX
@@ -12,7 +12,7 @@ BO_ 359 STEERING_IPAS_COMMA: 8 IPAS
  SG_ SET_ME_X00 : 55|8@0+ (1,0) [0|255] "" XXX
  SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
 
-CM BO_ STEERING_IPAS_COMMA "Copy of msg 614 so we can do angle control while the Park Assist ECU is connected (Panda spoofs 614 with 359 on connector J70). Note that addresses 0x266 and 0x167 are checksum-invariant";
+CM_ "BO_ STEERING_IPAS_COMMA: Copy of msg 614 so we can do angle control while the Park Assist ECU is connected (Panda spoofs 614 with 359 on connector J70). Note that addresses 0x266 and 0x167 are checksum-invariant";
 
  BO_ 512 GAS_COMMAND: 6 EON
   SG_ GAS_COMMAND : 7|16@0+ (0.159375,-75.555) [0|1] "" INTERCEPTOR
@@ -33,10 +33,10 @@ CM BO_ STEERING_IPAS_COMMA "Copy of msg 614 so we can do angle control while the
 BO_ 35 SECONDARY_STEER_ANGLE: 8 XXX
  SG_ ZORRO_STEER : 7|24@0- (0.004901594652,0) [-500|500] "" XXX
 
-CM BO_ SECONDARY_STEER_ANGLE "ZSS is a high-precision steering angle sensor that can replace the lower resolution sensor in most TSS1 Toyotas. Learn more: https://github.com/commaai/openpilot/wiki/Toyota-Lexus#zorro-steering-sensor-zss";
+CM_ "BO_ SECONDARY_STEER_ANGLE: ZSS is a high-precision steering angle sensor that can replace the lower resolution sensor in most TSS1 Toyotas. Learn more: https://github.com/commaai/openpilot/wiki/Toyota-Lexus#zorro-steering-sensor-zss";
 
 
-CM_ "Imported file _toyota_2017.dbc starts here"
+CM_ "Imported file _toyota_2017.dbc starts here";
 VERSION ""
 
 
@@ -325,7 +325,7 @@ CM_ SG_ 614 ANGLE "set to measured angle when ipas control isn't active";
 CM_ SG_ 643 COUNTER "only used on cars that use this msg for cruise control";
 CM_ SG_ 643 BRAKE_STATUS "only used on cars that use this msg for cruise control";
 CM_ SG_ 643 PRECOLLISION_ACTIVE "set 0.5s before any braking";
-CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was "SET_ME_1" and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG.";
+CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was 'SET_ME_1' and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG.";
 CM_ SG_ 835 ACCEL_CMD_ALT "Copy of main ACCEL_CMD, but across 8 bits instead of 16 bits like ACCEL_CMD. Unsure if only informational or has an effect. Likely informational as existing openpilot sets this to 0 and no loss of functionality observed. Originally 'AT_RAW' in leaked toyota_2017_ref_pt.dbc file.";
 CM_ SG_ 921 UI_SET_SPEED "set speed shown in UI with user set unit";
 CM_ SG_ 951 BRAKE_LIGHTS_ACC "brake lights when ACC commands decel";
@@ -333,7 +333,7 @@ CM_ SG_ 1042 SET_ME_1 "unclear what this is, but it's always 1 in drive traces";
 CM_ SG_ 1042 REPEATED_BEEPS "recommended for fcw and other important alerts";
 CM_ SG_ 1161 SPDVAL1 "Numbers 0-199 is displayed, 200-254 displays circle without number and 255 is for no limit.";
 CM_ SG_ 1161 SYNCID1 "counter from 1 to f at 1 Hz";
-CM_ SG_ 1161 SPDVAL2 "conditional speed value 70"
+CM_ SG_ 1161 SPDVAL2 "conditional speed value 70";
 CM_ SG_ 1162 SGNNUMP "1 if SPDVAL1 is set, otherwise 0";
 CM_ SG_ 1162 SYNCID2 "counter from 1 to f at 1 Hz";
 CM_ SG_ 1163 TSREQPD "always 1";
@@ -367,7 +367,7 @@ VAL_ 1162 SPLSGN3 15 "conditional blank" 4 "wet road" 5 "rain" 0 "none";
 
 CM_ "CHFFR_METRIC 37 STEER_ANGLE STEER_ANGLE 0.36 180";
 
-CM_ "lexus_nx300h_2018_pt.dbc starts here"
+CM_ "lexus_nx300h_2018_pt.dbc starts here";
 
 
 
diff --git a/lexus_rx_350_2016_pt_generated.dbc b/lexus_rx_350_2016_pt_generated.dbc
index 8d20e11..17e1839 100644
--- a/lexus_rx_350_2016_pt_generated.dbc
+++ b/lexus_rx_350_2016_pt_generated.dbc
@@ -1,7 +1,7 @@
-CM_ "AUTOGENERATED FILE, DO NOT EDIT"
+CM_ "AUTOGENERATED FILE, DO NOT EDIT";
 
 
-CM_ "Imported file _comma.dbc starts here"
+CM_ "Imported file _comma.dbc starts here";
 BO_ 359 STEERING_IPAS_COMMA: 8 IPAS
  SG_ STATE : 7|4@0+ (1,0) [0|15] "" XXX
  SG_ ANGLE : 3|12@0- (1.5,0) [-510|510] "deg" XXX
@@ -12,7 +12,7 @@ BO_ 359 STEERING_IPAS_COMMA: 8 IPAS
  SG_ SET_ME_X00 : 55|8@0+ (1,0) [0|255] "" XXX
  SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
 
-CM BO_ STEERING_IPAS_COMMA "Copy of msg 614 so we can do angle control while the Park Assist ECU is connected (Panda spoofs 614 with 359 on connector J70). Note that addresses 0x266 and 0x167 are checksum-invariant";
+CM_ "BO_ STEERING_IPAS_COMMA: Copy of msg 614 so we can do angle control while the Park Assist ECU is connected (Panda spoofs 614 with 359 on connector J70). Note that addresses 0x266 and 0x167 are checksum-invariant";
 
  BO_ 512 GAS_COMMAND: 6 EON
   SG_ GAS_COMMAND : 7|16@0+ (0.159375,-75.555) [0|1] "" INTERCEPTOR
@@ -33,10 +33,10 @@ CM BO_ STEERING_IPAS_COMMA "Copy of msg 614 so we can do angle control while the
 BO_ 35 SECONDARY_STEER_ANGLE: 8 XXX
  SG_ ZORRO_STEER : 7|24@0- (0.004901594652,0) [-500|500] "" XXX
 
-CM BO_ SECONDARY_STEER_ANGLE "ZSS is a high-precision steering angle sensor that can replace the lower resolution sensor in most TSS1 Toyotas. Learn more: https://github.com/commaai/openpilot/wiki/Toyota-Lexus#zorro-steering-sensor-zss";
+CM_ "BO_ SECONDARY_STEER_ANGLE: ZSS is a high-precision steering angle sensor that can replace the lower resolution sensor in most TSS1 Toyotas. Learn more: https://github.com/commaai/openpilot/wiki/Toyota-Lexus#zorro-steering-sensor-zss";
 
 
-CM_ "Imported file _toyota_2017.dbc starts here"
+CM_ "Imported file _toyota_2017.dbc starts here";
 VERSION ""
 
 
@@ -325,7 +325,7 @@ CM_ SG_ 614 ANGLE "set to measured angle when ipas control isn't active";
 CM_ SG_ 643 COUNTER "only used on cars that use this msg for cruise control";
 CM_ SG_ 643 BRAKE_STATUS "only used on cars that use this msg for cruise control";
 CM_ SG_ 643 PRECOLLISION_ACTIVE "set 0.5s before any braking";
-CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was "SET_ME_1" and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG.";
+CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was 'SET_ME_1' and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG.";
 CM_ SG_ 835 ACCEL_CMD_ALT "Copy of main ACCEL_CMD, but across 8 bits instead of 16 bits like ACCEL_CMD. Unsure if only informational or has an effect. Likely informational as existing openpilot sets this to 0 and no loss of functionality observed. Originally 'AT_RAW' in leaked toyota_2017_ref_pt.dbc file.";
 CM_ SG_ 921 UI_SET_SPEED "set speed shown in UI with user set unit";
 CM_ SG_ 951 BRAKE_LIGHTS_ACC "brake lights when ACC commands decel";
@@ -333,7 +333,7 @@ CM_ SG_ 1042 SET_ME_1 "unclear what this is, but it's always 1 in drive traces";
 CM_ SG_ 1042 REPEATED_BEEPS "recommended for fcw and other important alerts";
 CM_ SG_ 1161 SPDVAL1 "Numbers 0-199 is displayed, 200-254 displays circle without number and 255 is for no limit.";
 CM_ SG_ 1161 SYNCID1 "counter from 1 to f at 1 Hz";
-CM_ SG_ 1161 SPDVAL2 "conditional speed value 70"
+CM_ SG_ 1161 SPDVAL2 "conditional speed value 70";
 CM_ SG_ 1162 SGNNUMP "1 if SPDVAL1 is set, otherwise 0";
 CM_ SG_ 1162 SYNCID2 "counter from 1 to f at 1 Hz";
 CM_ SG_ 1163 TSREQPD "always 1";
@@ -367,7 +367,7 @@ VAL_ 1162 SPLSGN3 15 "conditional blank" 4 "wet road" 5 "rain" 0 "none";
 
 CM_ "CHFFR_METRIC 37 STEER_ANGLE STEER_ANGLE 0.36 180";
 
-CM_ "lexus_rx_350_2016_pt.dbc starts here"
+CM_ "lexus_rx_350_2016_pt.dbc starts here";
 
 
 
diff --git a/lexus_rx_hybrid_2017_pt_generated.dbc b/lexus_rx_hybrid_2017_pt_generated.dbc
index f96292b..773bcf6 100644
--- a/lexus_rx_hybrid_2017_pt_generated.dbc
+++ b/lexus_rx_hybrid_2017_pt_generated.dbc
@@ -1,7 +1,7 @@
-CM_ "AUTOGENERATED FILE, DO NOT EDIT"
+CM_ "AUTOGENERATED FILE, DO NOT EDIT";
 
 
-CM_ "Imported file _comma.dbc starts here"
+CM_ "Imported file _comma.dbc starts here";
 BO_ 359 STEERING_IPAS_COMMA: 8 IPAS
  SG_ STATE : 7|4@0+ (1,0) [0|15] "" XXX
  SG_ ANGLE : 3|12@0- (1.5,0) [-510|510] "deg" XXX
@@ -12,7 +12,7 @@ BO_ 359 STEERING_IPAS_COMMA: 8 IPAS
  SG_ SET_ME_X00 : 55|8@0+ (1,0) [0|255] "" XXX
  SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
 
-CM BO_ STEERING_IPAS_COMMA "Copy of msg 614 so we can do angle control while the Park Assist ECU is connected (Panda spoofs 614 with 359 on connector J70). Note that addresses 0x266 and 0x167 are checksum-invariant";
+CM_ "BO_ STEERING_IPAS_COMMA: Copy of msg 614 so we can do angle control while the Park Assist ECU is connected (Panda spoofs 614 with 359 on connector J70). Note that addresses 0x266 and 0x167 are checksum-invariant";
 
  BO_ 512 GAS_COMMAND: 6 EON
   SG_ GAS_COMMAND : 7|16@0+ (0.159375,-75.555) [0|1] "" INTERCEPTOR
@@ -33,10 +33,10 @@ CM BO_ STEERING_IPAS_COMMA "Copy of msg 614 so we can do angle control while the
 BO_ 35 SECONDARY_STEER_ANGLE: 8 XXX
  SG_ ZORRO_STEER : 7|24@0- (0.004901594652,0) [-500|500] "" XXX
 
-CM BO_ SECONDARY_STEER_ANGLE "ZSS is a high-precision steering angle sensor that can replace the lower resolution sensor in most TSS1 Toyotas. Learn more: https://github.com/commaai/openpilot/wiki/Toyota-Lexus#zorro-steering-sensor-zss";
+CM_ "BO_ SECONDARY_STEER_ANGLE: ZSS is a high-precision steering angle sensor that can replace the lower resolution sensor in most TSS1 Toyotas. Learn more: https://github.com/commaai/openpilot/wiki/Toyota-Lexus#zorro-steering-sensor-zss";
 
 
-CM_ "Imported file _toyota_2017.dbc starts here"
+CM_ "Imported file _toyota_2017.dbc starts here";
 VERSION ""
 
 
@@ -325,7 +325,7 @@ CM_ SG_ 614 ANGLE "set to measured angle when ipas control isn't active";
 CM_ SG_ 643 COUNTER "only used on cars that use this msg for cruise control";
 CM_ SG_ 643 BRAKE_STATUS "only used on cars that use this msg for cruise control";
 CM_ SG_ 643 PRECOLLISION_ACTIVE "set 0.5s before any braking";
-CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was "SET_ME_1" and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG.";
+CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was 'SET_ME_1' and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG.";
 CM_ SG_ 835 ACCEL_CMD_ALT "Copy of main ACCEL_CMD, but across 8 bits instead of 16 bits like ACCEL_CMD. Unsure if only informational or has an effect. Likely informational as existing openpilot sets this to 0 and no loss of functionality observed. Originally 'AT_RAW' in leaked toyota_2017_ref_pt.dbc file.";
 CM_ SG_ 921 UI_SET_SPEED "set speed shown in UI with user set unit";
 CM_ SG_ 951 BRAKE_LIGHTS_ACC "brake lights when ACC commands decel";
@@ -333,7 +333,7 @@ CM_ SG_ 1042 SET_ME_1 "unclear what this is, but it's always 1 in drive traces";
 CM_ SG_ 1042 REPEATED_BEEPS "recommended for fcw and other important alerts";
 CM_ SG_ 1161 SPDVAL1 "Numbers 0-199 is displayed, 200-254 displays circle without number and 255 is for no limit.";
 CM_ SG_ 1161 SYNCID1 "counter from 1 to f at 1 Hz";
-CM_ SG_ 1161 SPDVAL2 "conditional speed value 70"
+CM_ SG_ 1161 SPDVAL2 "conditional speed value 70";
 CM_ SG_ 1162 SGNNUMP "1 if SPDVAL1 is set, otherwise 0";
 CM_ SG_ 1162 SYNCID2 "counter from 1 to f at 1 Hz";
 CM_ SG_ 1163 TSREQPD "always 1";
@@ -367,7 +367,7 @@ VAL_ 1162 SPLSGN3 15 "conditional blank" 4 "wet road" 5 "rain" 0 "none";
 
 CM_ "CHFFR_METRIC 37 STEER_ANGLE STEER_ANGLE 0.36 180";
 
-CM_ "lexus_rx_hybrid_2017_pt.dbc starts here"
+CM_ "lexus_rx_hybrid_2017_pt.dbc starts here";
 
 
 
diff --git a/subaru_forester_2017_generated.dbc b/subaru_forester_2017_generated.dbc
index 96bc006..c1ef35f 100644
--- a/subaru_forester_2017_generated.dbc
+++ b/subaru_forester_2017_generated.dbc
@@ -1,7 +1,7 @@
-CM_ "AUTOGENERATED FILE, DO NOT EDIT"
+CM_ "AUTOGENERATED FILE, DO NOT EDIT";
 
 
-CM_ "Imported file _subaru_preglobal_2015.dbc starts here"
+CM_ "Imported file _subaru_preglobal_2015.dbc starts here";
 VERSION ""
 
 
@@ -240,7 +240,7 @@ CM_ SG_ 880 Steering_Voltage_Flat "receives later than 371";
 VAL_ 328 Gear 0 "N" 1 "D" 2 "D" 3 "D" 4 "D" 5 "D" 6 "D" 14 "R" 15 "P";
 VAL_ 1745 Units 0 "Metric" 1 "Imperial";
 
-CM_ "subaru_forester_2017.dbc starts here"
+CM_ "subaru_forester_2017.dbc starts here";
 
 
 BO_ 355 ES_DashStatus: 8 XXX
diff --git a/subaru_global_2017_generated.dbc b/subaru_global_2017_generated.dbc
index 39063a3..f17667e 100644
--- a/subaru_global_2017_generated.dbc
+++ b/subaru_global_2017_generated.dbc
@@ -1,7 +1,7 @@
-CM_ "AUTOGENERATED FILE, DO NOT EDIT"
+CM_ "AUTOGENERATED FILE, DO NOT EDIT";
 
 
-CM_ "Imported file _subaru_global.dbc starts here"
+CM_ "Imported file _subaru_global.dbc starts here";
 VERSION ""
 
 
@@ -244,7 +244,7 @@ CM_ SG_ 940 Highbeam "01 = low beam, 11 = high beam";
 CM_ SG_ 940 FOG_LIGHTS2 "yellow fog light in the dash";
 CM_ SG_ 1677 Units "AU/EU: 1 = imperial, 3 = metric US: 3 = imperial, 4 = metric";
 
-CM_ "subaru_global_2017.dbc starts here"
+CM_ "subaru_global_2017.dbc starts here";
 
 
 BO_ 72 Transmission: 8 XXX
diff --git a/subaru_global_2020_hybrid_generated.dbc b/subaru_global_2020_hybrid_generated.dbc
index 069da38..2b376dd 100644
--- a/subaru_global_2020_hybrid_generated.dbc
+++ b/subaru_global_2020_hybrid_generated.dbc
@@ -1,7 +1,7 @@
-CM_ "AUTOGENERATED FILE, DO NOT EDIT"
+CM_ "AUTOGENERATED FILE, DO NOT EDIT";
 
 
-CM_ "Imported file _subaru_global.dbc starts here"
+CM_ "Imported file _subaru_global.dbc starts here";
 VERSION ""
 
 
@@ -244,7 +244,7 @@ CM_ SG_ 940 Highbeam "01 = low beam, 11 = high beam";
 CM_ SG_ 940 FOG_LIGHTS2 "yellow fog light in the dash";
 CM_ SG_ 1677 Units "AU/EU: 1 = imperial, 3 = metric US: 3 = imperial, 4 = metric";
 
-CM_ "subaru_global_2020_hybrid.dbc starts here"
+CM_ "subaru_global_2020_hybrid.dbc starts here";
 
 
 BO_ 39 Cruise_Status_2: 8 XXX
diff --git a/subaru_outback_2015_generated.dbc b/subaru_outback_2015_generated.dbc
index 62e3e84..c0a6015 100644
--- a/subaru_outback_2015_generated.dbc
+++ b/subaru_outback_2015_generated.dbc
@@ -1,7 +1,7 @@
-CM_ "AUTOGENERATED FILE, DO NOT EDIT"
+CM_ "AUTOGENERATED FILE, DO NOT EDIT";
 
 
-CM_ "Imported file _subaru_preglobal_2015.dbc starts here"
+CM_ "Imported file _subaru_preglobal_2015.dbc starts here";
 VERSION ""
 
 
@@ -240,7 +240,7 @@ CM_ SG_ 880 Steering_Voltage_Flat "receives later than 371";
 VAL_ 328 Gear 0 "N" 1 "D" 2 "D" 3 "D" 4 "D" 5 "D" 6 "D" 14 "R" 15 "P";
 VAL_ 1745 Units 0 "Metric" 1 "Imperial";
 
-CM_ "subaru_outback_2015.dbc starts here"
+CM_ "subaru_outback_2015.dbc starts here";
 
 
 BO_ 358 ES_DashStatus: 8 XXX
diff --git a/subaru_outback_2019_generated.dbc b/subaru_outback_2019_generated.dbc
index 0d5c14b..00b0424 100644
--- a/subaru_outback_2019_generated.dbc
+++ b/subaru_outback_2019_generated.dbc
@@ -1,7 +1,7 @@
-CM_ "AUTOGENERATED FILE, DO NOT EDIT"
+CM_ "AUTOGENERATED FILE, DO NOT EDIT";
 
 
-CM_ "Imported file _subaru_preglobal_2015.dbc starts here"
+CM_ "Imported file _subaru_preglobal_2015.dbc starts here";
 VERSION ""
 
 
@@ -240,7 +240,7 @@ CM_ SG_ 880 Steering_Voltage_Flat "receives later than 371";
 VAL_ 328 Gear 0 "N" 1 "D" 2 "D" 3 "D" 4 "D" 5 "D" 6 "D" 14 "R" 15 "P";
 VAL_ 1745 Units 0 "Metric" 1 "Imperial";
 
-CM_ "subaru_outback_2019.dbc starts here"
+CM_ "subaru_outback_2019.dbc starts here";
 
 
 BO_ 358 ES_DashStatus: 8 XXX
diff --git a/toyota_avalon_2017_pt_generated.dbc b/toyota_avalon_2017_pt_generated.dbc
index 0c26ac6..e403f67 100644
--- a/toyota_avalon_2017_pt_generated.dbc
+++ b/toyota_avalon_2017_pt_generated.dbc
@@ -1,7 +1,7 @@
-CM_ "AUTOGENERATED FILE, DO NOT EDIT"
+CM_ "AUTOGENERATED FILE, DO NOT EDIT";
 
 
-CM_ "Imported file _comma.dbc starts here"
+CM_ "Imported file _comma.dbc starts here";
 BO_ 359 STEERING_IPAS_COMMA: 8 IPAS
  SG_ STATE : 7|4@0+ (1,0) [0|15] "" XXX
  SG_ ANGLE : 3|12@0- (1.5,0) [-510|510] "deg" XXX
@@ -12,7 +12,7 @@ BO_ 359 STEERING_IPAS_COMMA: 8 IPAS
  SG_ SET_ME_X00 : 55|8@0+ (1,0) [0|255] "" XXX
  SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
 
-CM BO_ STEERING_IPAS_COMMA "Copy of msg 614 so we can do angle control while the Park Assist ECU is connected (Panda spoofs 614 with 359 on connector J70). Note that addresses 0x266 and 0x167 are checksum-invariant";
+CM_ "BO_ STEERING_IPAS_COMMA: Copy of msg 614 so we can do angle control while the Park Assist ECU is connected (Panda spoofs 614 with 359 on connector J70). Note that addresses 0x266 and 0x167 are checksum-invariant";
 
  BO_ 512 GAS_COMMAND: 6 EON
   SG_ GAS_COMMAND : 7|16@0+ (0.159375,-75.555) [0|1] "" INTERCEPTOR
@@ -33,10 +33,10 @@ CM BO_ STEERING_IPAS_COMMA "Copy of msg 614 so we can do angle control while the
 BO_ 35 SECONDARY_STEER_ANGLE: 8 XXX
  SG_ ZORRO_STEER : 7|24@0- (0.004901594652,0) [-500|500] "" XXX
 
-CM BO_ SECONDARY_STEER_ANGLE "ZSS is a high-precision steering angle sensor that can replace the lower resolution sensor in most TSS1 Toyotas. Learn more: https://github.com/commaai/openpilot/wiki/Toyota-Lexus#zorro-steering-sensor-zss";
+CM_ "BO_ SECONDARY_STEER_ANGLE: ZSS is a high-precision steering angle sensor that can replace the lower resolution sensor in most TSS1 Toyotas. Learn more: https://github.com/commaai/openpilot/wiki/Toyota-Lexus#zorro-steering-sensor-zss";
 
 
-CM_ "Imported file _toyota_2017.dbc starts here"
+CM_ "Imported file _toyota_2017.dbc starts here";
 VERSION ""
 
 
@@ -325,7 +325,7 @@ CM_ SG_ 614 ANGLE "set to measured angle when ipas control isn't active";
 CM_ SG_ 643 COUNTER "only used on cars that use this msg for cruise control";
 CM_ SG_ 643 BRAKE_STATUS "only used on cars that use this msg for cruise control";
 CM_ SG_ 643 PRECOLLISION_ACTIVE "set 0.5s before any braking";
-CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was "SET_ME_1" and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG.";
+CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was 'SET_ME_1' and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG.";
 CM_ SG_ 835 ACCEL_CMD_ALT "Copy of main ACCEL_CMD, but across 8 bits instead of 16 bits like ACCEL_CMD. Unsure if only informational or has an effect. Likely informational as existing openpilot sets this to 0 and no loss of functionality observed. Originally 'AT_RAW' in leaked toyota_2017_ref_pt.dbc file.";
 CM_ SG_ 921 UI_SET_SPEED "set speed shown in UI with user set unit";
 CM_ SG_ 951 BRAKE_LIGHTS_ACC "brake lights when ACC commands decel";
@@ -333,7 +333,7 @@ CM_ SG_ 1042 SET_ME_1 "unclear what this is, but it's always 1 in drive traces";
 CM_ SG_ 1042 REPEATED_BEEPS "recommended for fcw and other important alerts";
 CM_ SG_ 1161 SPDVAL1 "Numbers 0-199 is displayed, 200-254 displays circle without number and 255 is for no limit.";
 CM_ SG_ 1161 SYNCID1 "counter from 1 to f at 1 Hz";
-CM_ SG_ 1161 SPDVAL2 "conditional speed value 70"
+CM_ SG_ 1161 SPDVAL2 "conditional speed value 70";
 CM_ SG_ 1162 SGNNUMP "1 if SPDVAL1 is set, otherwise 0";
 CM_ SG_ 1162 SYNCID2 "counter from 1 to f at 1 Hz";
 CM_ SG_ 1163 TSREQPD "always 1";
@@ -367,7 +367,7 @@ VAL_ 1162 SPLSGN3 15 "conditional blank" 4 "wet road" 5 "rain" 0 "none";
 
 CM_ "CHFFR_METRIC 37 STEER_ANGLE STEER_ANGLE 0.36 180";
 
-CM_ "toyota_avalon_2017_pt.dbc starts here"
+CM_ "toyota_avalon_2017_pt.dbc starts here";
 
 
 
diff --git a/toyota_camry_hybrid_2018_pt_generated.dbc b/toyota_camry_hybrid_2018_pt_generated.dbc
index 0a024ca..d0368c4 100644
--- a/toyota_camry_hybrid_2018_pt_generated.dbc
+++ b/toyota_camry_hybrid_2018_pt_generated.dbc
@@ -1,7 +1,7 @@
-CM_ "AUTOGENERATED FILE, DO NOT EDIT"
+CM_ "AUTOGENERATED FILE, DO NOT EDIT";
 
 
-CM_ "Imported file _comma.dbc starts here"
+CM_ "Imported file _comma.dbc starts here";
 BO_ 359 STEERING_IPAS_COMMA: 8 IPAS
  SG_ STATE : 7|4@0+ (1,0) [0|15] "" XXX
  SG_ ANGLE : 3|12@0- (1.5,0) [-510|510] "deg" XXX
@@ -12,7 +12,7 @@ BO_ 359 STEERING_IPAS_COMMA: 8 IPAS
  SG_ SET_ME_X00 : 55|8@0+ (1,0) [0|255] "" XXX
  SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
 
-CM BO_ STEERING_IPAS_COMMA "Copy of msg 614 so we can do angle control while the Park Assist ECU is connected (Panda spoofs 614 with 359 on connector J70). Note that addresses 0x266 and 0x167 are checksum-invariant";
+CM_ "BO_ STEERING_IPAS_COMMA: Copy of msg 614 so we can do angle control while the Park Assist ECU is connected (Panda spoofs 614 with 359 on connector J70). Note that addresses 0x266 and 0x167 are checksum-invariant";
 
  BO_ 512 GAS_COMMAND: 6 EON
   SG_ GAS_COMMAND : 7|16@0+ (0.159375,-75.555) [0|1] "" INTERCEPTOR
@@ -33,10 +33,10 @@ CM BO_ STEERING_IPAS_COMMA "Copy of msg 614 so we can do angle control while the
 BO_ 35 SECONDARY_STEER_ANGLE: 8 XXX
  SG_ ZORRO_STEER : 7|24@0- (0.004901594652,0) [-500|500] "" XXX
 
-CM BO_ SECONDARY_STEER_ANGLE "ZSS is a high-precision steering angle sensor that can replace the lower resolution sensor in most TSS1 Toyotas. Learn more: https://github.com/commaai/openpilot/wiki/Toyota-Lexus#zorro-steering-sensor-zss";
+CM_ "BO_ SECONDARY_STEER_ANGLE: ZSS is a high-precision steering angle sensor that can replace the lower resolution sensor in most TSS1 Toyotas. Learn more: https://github.com/commaai/openpilot/wiki/Toyota-Lexus#zorro-steering-sensor-zss";
 
 
-CM_ "Imported file _toyota_2017.dbc starts here"
+CM_ "Imported file _toyota_2017.dbc starts here";
 VERSION ""
 
 
@@ -325,7 +325,7 @@ CM_ SG_ 614 ANGLE "set to measured angle when ipas control isn't active";
 CM_ SG_ 643 COUNTER "only used on cars that use this msg for cruise control";
 CM_ SG_ 643 BRAKE_STATUS "only used on cars that use this msg for cruise control";
 CM_ SG_ 643 PRECOLLISION_ACTIVE "set 0.5s before any braking";
-CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was "SET_ME_1" and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG.";
+CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was 'SET_ME_1' and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG.";
 CM_ SG_ 835 ACCEL_CMD_ALT "Copy of main ACCEL_CMD, but across 8 bits instead of 16 bits like ACCEL_CMD. Unsure if only informational or has an effect. Likely informational as existing openpilot sets this to 0 and no loss of functionality observed. Originally 'AT_RAW' in leaked toyota_2017_ref_pt.dbc file.";
 CM_ SG_ 921 UI_SET_SPEED "set speed shown in UI with user set unit";
 CM_ SG_ 951 BRAKE_LIGHTS_ACC "brake lights when ACC commands decel";
@@ -333,7 +333,7 @@ CM_ SG_ 1042 SET_ME_1 "unclear what this is, but it's always 1 in drive traces";
 CM_ SG_ 1042 REPEATED_BEEPS "recommended for fcw and other important alerts";
 CM_ SG_ 1161 SPDVAL1 "Numbers 0-199 is displayed, 200-254 displays circle without number and 255 is for no limit.";
 CM_ SG_ 1161 SYNCID1 "counter from 1 to f at 1 Hz";
-CM_ SG_ 1161 SPDVAL2 "conditional speed value 70"
+CM_ SG_ 1161 SPDVAL2 "conditional speed value 70";
 CM_ SG_ 1162 SGNNUMP "1 if SPDVAL1 is set, otherwise 0";
 CM_ SG_ 1162 SYNCID2 "counter from 1 to f at 1 Hz";
 CM_ SG_ 1163 TSREQPD "always 1";
@@ -367,7 +367,7 @@ VAL_ 1162 SPLSGN3 15 "conditional blank" 4 "wet road" 5 "rain" 0 "none";
 
 CM_ "CHFFR_METRIC 37 STEER_ANGLE STEER_ANGLE 0.36 180";
 
-CM_ "toyota_camry_hybrid_2018_pt.dbc starts here"
+CM_ "toyota_camry_hybrid_2018_pt.dbc starts here";
 
 
 
diff --git a/toyota_corolla_2017_pt_generated.dbc b/toyota_corolla_2017_pt_generated.dbc
index e1552d1..0d6ffb1 100644
--- a/toyota_corolla_2017_pt_generated.dbc
+++ b/toyota_corolla_2017_pt_generated.dbc
@@ -1,7 +1,7 @@
-CM_ "AUTOGENERATED FILE, DO NOT EDIT"
+CM_ "AUTOGENERATED FILE, DO NOT EDIT";
 
 
-CM_ "Imported file _comma.dbc starts here"
+CM_ "Imported file _comma.dbc starts here";
 BO_ 359 STEERING_IPAS_COMMA: 8 IPAS
  SG_ STATE : 7|4@0+ (1,0) [0|15] "" XXX
  SG_ ANGLE : 3|12@0- (1.5,0) [-510|510] "deg" XXX
@@ -12,7 +12,7 @@ BO_ 359 STEERING_IPAS_COMMA: 8 IPAS
  SG_ SET_ME_X00 : 55|8@0+ (1,0) [0|255] "" XXX
  SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
 
-CM BO_ STEERING_IPAS_COMMA "Copy of msg 614 so we can do angle control while the Park Assist ECU is connected (Panda spoofs 614 with 359 on connector J70). Note that addresses 0x266 and 0x167 are checksum-invariant";
+CM_ "BO_ STEERING_IPAS_COMMA: Copy of msg 614 so we can do angle control while the Park Assist ECU is connected (Panda spoofs 614 with 359 on connector J70). Note that addresses 0x266 and 0x167 are checksum-invariant";
 
  BO_ 512 GAS_COMMAND: 6 EON
   SG_ GAS_COMMAND : 7|16@0+ (0.159375,-75.555) [0|1] "" INTERCEPTOR
@@ -33,10 +33,10 @@ CM BO_ STEERING_IPAS_COMMA "Copy of msg 614 so we can do angle control while the
 BO_ 35 SECONDARY_STEER_ANGLE: 8 XXX
  SG_ ZORRO_STEER : 7|24@0- (0.004901594652,0) [-500|500] "" XXX
 
-CM BO_ SECONDARY_STEER_ANGLE "ZSS is a high-precision steering angle sensor that can replace the lower resolution sensor in most TSS1 Toyotas. Learn more: https://github.com/commaai/openpilot/wiki/Toyota-Lexus#zorro-steering-sensor-zss";
+CM_ "BO_ SECONDARY_STEER_ANGLE: ZSS is a high-precision steering angle sensor that can replace the lower resolution sensor in most TSS1 Toyotas. Learn more: https://github.com/commaai/openpilot/wiki/Toyota-Lexus#zorro-steering-sensor-zss";
 
 
-CM_ "Imported file _toyota_2017.dbc starts here"
+CM_ "Imported file _toyota_2017.dbc starts here";
 VERSION ""
 
 
@@ -325,7 +325,7 @@ CM_ SG_ 614 ANGLE "set to measured angle when ipas control isn't active";
 CM_ SG_ 643 COUNTER "only used on cars that use this msg for cruise control";
 CM_ SG_ 643 BRAKE_STATUS "only used on cars that use this msg for cruise control";
 CM_ SG_ 643 PRECOLLISION_ACTIVE "set 0.5s before any braking";
-CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was "SET_ME_1" and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG.";
+CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was 'SET_ME_1' and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG.";
 CM_ SG_ 835 ACCEL_CMD_ALT "Copy of main ACCEL_CMD, but across 8 bits instead of 16 bits like ACCEL_CMD. Unsure if only informational or has an effect. Likely informational as existing openpilot sets this to 0 and no loss of functionality observed. Originally 'AT_RAW' in leaked toyota_2017_ref_pt.dbc file.";
 CM_ SG_ 921 UI_SET_SPEED "set speed shown in UI with user set unit";
 CM_ SG_ 951 BRAKE_LIGHTS_ACC "brake lights when ACC commands decel";
@@ -333,7 +333,7 @@ CM_ SG_ 1042 SET_ME_1 "unclear what this is, but it's always 1 in drive traces";
 CM_ SG_ 1042 REPEATED_BEEPS "recommended for fcw and other important alerts";
 CM_ SG_ 1161 SPDVAL1 "Numbers 0-199 is displayed, 200-254 displays circle without number and 255 is for no limit.";
 CM_ SG_ 1161 SYNCID1 "counter from 1 to f at 1 Hz";
-CM_ SG_ 1161 SPDVAL2 "conditional speed value 70"
+CM_ SG_ 1161 SPDVAL2 "conditional speed value 70";
 CM_ SG_ 1162 SGNNUMP "1 if SPDVAL1 is set, otherwise 0";
 CM_ SG_ 1162 SYNCID2 "counter from 1 to f at 1 Hz";
 CM_ SG_ 1163 TSREQPD "always 1";
@@ -367,7 +367,7 @@ VAL_ 1162 SPLSGN3 15 "conditional blank" 4 "wet road" 5 "rain" 0 "none";
 
 CM_ "CHFFR_METRIC 37 STEER_ANGLE STEER_ANGLE 0.36 180";
 
-CM_ "toyota_corolla_2017_pt.dbc starts here"
+CM_ "toyota_corolla_2017_pt.dbc starts here";
 
 
 
diff --git a/toyota_highlander_2017_pt_generated.dbc b/toyota_highlander_2017_pt_generated.dbc
index 6b864e1..f973795 100644
--- a/toyota_highlander_2017_pt_generated.dbc
+++ b/toyota_highlander_2017_pt_generated.dbc
@@ -1,7 +1,7 @@
-CM_ "AUTOGENERATED FILE, DO NOT EDIT"
+CM_ "AUTOGENERATED FILE, DO NOT EDIT";
 
 
-CM_ "Imported file _comma.dbc starts here"
+CM_ "Imported file _comma.dbc starts here";
 BO_ 359 STEERING_IPAS_COMMA: 8 IPAS
  SG_ STATE : 7|4@0+ (1,0) [0|15] "" XXX
  SG_ ANGLE : 3|12@0- (1.5,0) [-510|510] "deg" XXX
@@ -12,7 +12,7 @@ BO_ 359 STEERING_IPAS_COMMA: 8 IPAS
  SG_ SET_ME_X00 : 55|8@0+ (1,0) [0|255] "" XXX
  SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
 
-CM BO_ STEERING_IPAS_COMMA "Copy of msg 614 so we can do angle control while the Park Assist ECU is connected (Panda spoofs 614 with 359 on connector J70). Note that addresses 0x266 and 0x167 are checksum-invariant";
+CM_ "BO_ STEERING_IPAS_COMMA: Copy of msg 614 so we can do angle control while the Park Assist ECU is connected (Panda spoofs 614 with 359 on connector J70). Note that addresses 0x266 and 0x167 are checksum-invariant";
 
  BO_ 512 GAS_COMMAND: 6 EON
   SG_ GAS_COMMAND : 7|16@0+ (0.159375,-75.555) [0|1] "" INTERCEPTOR
@@ -33,10 +33,10 @@ CM BO_ STEERING_IPAS_COMMA "Copy of msg 614 so we can do angle control while the
 BO_ 35 SECONDARY_STEER_ANGLE: 8 XXX
  SG_ ZORRO_STEER : 7|24@0- (0.004901594652,0) [-500|500] "" XXX
 
-CM BO_ SECONDARY_STEER_ANGLE "ZSS is a high-precision steering angle sensor that can replace the lower resolution sensor in most TSS1 Toyotas. Learn more: https://github.com/commaai/openpilot/wiki/Toyota-Lexus#zorro-steering-sensor-zss";
+CM_ "BO_ SECONDARY_STEER_ANGLE: ZSS is a high-precision steering angle sensor that can replace the lower resolution sensor in most TSS1 Toyotas. Learn more: https://github.com/commaai/openpilot/wiki/Toyota-Lexus#zorro-steering-sensor-zss";
 
 
-CM_ "Imported file _toyota_2017.dbc starts here"
+CM_ "Imported file _toyota_2017.dbc starts here";
 VERSION ""
 
 
@@ -325,7 +325,7 @@ CM_ SG_ 614 ANGLE "set to measured angle when ipas control isn't active";
 CM_ SG_ 643 COUNTER "only used on cars that use this msg for cruise control";
 CM_ SG_ 643 BRAKE_STATUS "only used on cars that use this msg for cruise control";
 CM_ SG_ 643 PRECOLLISION_ACTIVE "set 0.5s before any braking";
-CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was "SET_ME_1" and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG.";
+CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was 'SET_ME_1' and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG.";
 CM_ SG_ 835 ACCEL_CMD_ALT "Copy of main ACCEL_CMD, but across 8 bits instead of 16 bits like ACCEL_CMD. Unsure if only informational or has an effect. Likely informational as existing openpilot sets this to 0 and no loss of functionality observed. Originally 'AT_RAW' in leaked toyota_2017_ref_pt.dbc file.";
 CM_ SG_ 921 UI_SET_SPEED "set speed shown in UI with user set unit";
 CM_ SG_ 951 BRAKE_LIGHTS_ACC "brake lights when ACC commands decel";
@@ -333,7 +333,7 @@ CM_ SG_ 1042 SET_ME_1 "unclear what this is, but it's always 1 in drive traces";
 CM_ SG_ 1042 REPEATED_BEEPS "recommended for fcw and other important alerts";
 CM_ SG_ 1161 SPDVAL1 "Numbers 0-199 is displayed, 200-254 displays circle without number and 255 is for no limit.";
 CM_ SG_ 1161 SYNCID1 "counter from 1 to f at 1 Hz";
-CM_ SG_ 1161 SPDVAL2 "conditional speed value 70"
+CM_ SG_ 1161 SPDVAL2 "conditional speed value 70";
 CM_ SG_ 1162 SGNNUMP "1 if SPDVAL1 is set, otherwise 0";
 CM_ SG_ 1162 SYNCID2 "counter from 1 to f at 1 Hz";
 CM_ SG_ 1163 TSREQPD "always 1";
@@ -367,7 +367,7 @@ VAL_ 1162 SPLSGN3 15 "conditional blank" 4 "wet road" 5 "rain" 0 "none";
 
 CM_ "CHFFR_METRIC 37 STEER_ANGLE STEER_ANGLE 0.36 180";
 
-CM_ "toyota_highlander_2017_pt.dbc starts here"
+CM_ "toyota_highlander_2017_pt.dbc starts here";
 
 
 
diff --git a/toyota_highlander_hybrid_2018_pt_generated.dbc b/toyota_highlander_hybrid_2018_pt_generated.dbc
index c63d0c7..ffb0821 100644
--- a/toyota_highlander_hybrid_2018_pt_generated.dbc
+++ b/toyota_highlander_hybrid_2018_pt_generated.dbc
@@ -1,7 +1,7 @@
-CM_ "AUTOGENERATED FILE, DO NOT EDIT"
+CM_ "AUTOGENERATED FILE, DO NOT EDIT";
 
 
-CM_ "Imported file _comma.dbc starts here"
+CM_ "Imported file _comma.dbc starts here";
 BO_ 359 STEERING_IPAS_COMMA: 8 IPAS
  SG_ STATE : 7|4@0+ (1,0) [0|15] "" XXX
  SG_ ANGLE : 3|12@0- (1.5,0) [-510|510] "deg" XXX
@@ -12,7 +12,7 @@ BO_ 359 STEERING_IPAS_COMMA: 8 IPAS
  SG_ SET_ME_X00 : 55|8@0+ (1,0) [0|255] "" XXX
  SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
 
-CM BO_ STEERING_IPAS_COMMA "Copy of msg 614 so we can do angle control while the Park Assist ECU is connected (Panda spoofs 614 with 359 on connector J70). Note that addresses 0x266 and 0x167 are checksum-invariant";
+CM_ "BO_ STEERING_IPAS_COMMA: Copy of msg 614 so we can do angle control while the Park Assist ECU is connected (Panda spoofs 614 with 359 on connector J70). Note that addresses 0x266 and 0x167 are checksum-invariant";
 
  BO_ 512 GAS_COMMAND: 6 EON
   SG_ GAS_COMMAND : 7|16@0+ (0.159375,-75.555) [0|1] "" INTERCEPTOR
@@ -33,10 +33,10 @@ CM BO_ STEERING_IPAS_COMMA "Copy of msg 614 so we can do angle control while the
 BO_ 35 SECONDARY_STEER_ANGLE: 8 XXX
  SG_ ZORRO_STEER : 7|24@0- (0.004901594652,0) [-500|500] "" XXX
 
-CM BO_ SECONDARY_STEER_ANGLE "ZSS is a high-precision steering angle sensor that can replace the lower resolution sensor in most TSS1 Toyotas. Learn more: https://github.com/commaai/openpilot/wiki/Toyota-Lexus#zorro-steering-sensor-zss";
+CM_ "BO_ SECONDARY_STEER_ANGLE: ZSS is a high-precision steering angle sensor that can replace the lower resolution sensor in most TSS1 Toyotas. Learn more: https://github.com/commaai/openpilot/wiki/Toyota-Lexus#zorro-steering-sensor-zss";
 
 
-CM_ "Imported file _toyota_2017.dbc starts here"
+CM_ "Imported file _toyota_2017.dbc starts here";
 VERSION ""
 
 
@@ -325,7 +325,7 @@ CM_ SG_ 614 ANGLE "set to measured angle when ipas control isn't active";
 CM_ SG_ 643 COUNTER "only used on cars that use this msg for cruise control";
 CM_ SG_ 643 BRAKE_STATUS "only used on cars that use this msg for cruise control";
 CM_ SG_ 643 PRECOLLISION_ACTIVE "set 0.5s before any braking";
-CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was "SET_ME_1" and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG.";
+CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was 'SET_ME_1' and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG.";
 CM_ SG_ 835 ACCEL_CMD_ALT "Copy of main ACCEL_CMD, but across 8 bits instead of 16 bits like ACCEL_CMD. Unsure if only informational or has an effect. Likely informational as existing openpilot sets this to 0 and no loss of functionality observed. Originally 'AT_RAW' in leaked toyota_2017_ref_pt.dbc file.";
 CM_ SG_ 921 UI_SET_SPEED "set speed shown in UI with user set unit";
 CM_ SG_ 951 BRAKE_LIGHTS_ACC "brake lights when ACC commands decel";
@@ -333,7 +333,7 @@ CM_ SG_ 1042 SET_ME_1 "unclear what this is, but it's always 1 in drive traces";
 CM_ SG_ 1042 REPEATED_BEEPS "recommended for fcw and other important alerts";
 CM_ SG_ 1161 SPDVAL1 "Numbers 0-199 is displayed, 200-254 displays circle without number and 255 is for no limit.";
 CM_ SG_ 1161 SYNCID1 "counter from 1 to f at 1 Hz";
-CM_ SG_ 1161 SPDVAL2 "conditional speed value 70"
+CM_ SG_ 1161 SPDVAL2 "conditional speed value 70";
 CM_ SG_ 1162 SGNNUMP "1 if SPDVAL1 is set, otherwise 0";
 CM_ SG_ 1162 SYNCID2 "counter from 1 to f at 1 Hz";
 CM_ SG_ 1163 TSREQPD "always 1";
@@ -367,7 +367,7 @@ VAL_ 1162 SPLSGN3 15 "conditional blank" 4 "wet road" 5 "rain" 0 "none";
 
 CM_ "CHFFR_METRIC 37 STEER_ANGLE STEER_ANGLE 0.36 180";
 
-CM_ "toyota_highlander_hybrid_2018_pt.dbc starts here"
+CM_ "toyota_highlander_hybrid_2018_pt.dbc starts here";
 
 
 
diff --git a/toyota_nodsu_hybrid_pt_generated.dbc b/toyota_nodsu_hybrid_pt_generated.dbc
index e21015b..19aecda 100644
--- a/toyota_nodsu_hybrid_pt_generated.dbc
+++ b/toyota_nodsu_hybrid_pt_generated.dbc
@@ -1,7 +1,7 @@
-CM_ "AUTOGENERATED FILE, DO NOT EDIT"
+CM_ "AUTOGENERATED FILE, DO NOT EDIT";
 
 
-CM_ "Imported file _toyota_nodsu_bsm.dbc starts here"
+CM_ "Imported file _toyota_nodsu_bsm.dbc starts here";
 BO_ 1014 BSM: 8 XXX
  SG_ L_ADJACENT : 0|1@0+ (1,0) [0|1] "" XXX
  SG_ L_APPROACHING : 8|1@0+ (1,0) [0|1] "" XXX
@@ -18,7 +18,7 @@ CM_ SG_ 1014 ADJACENT_ENABLED "when BSM is enabled in settings, this is on along
 CM_ SG_ 1014 APPROACHING_ENABLED "when BSM is enabled in settings, this is on along with ADJACENT_ENABLED. this controls bsm alert visibility";
 
 
-CM_ "Imported file _comma.dbc starts here"
+CM_ "Imported file _comma.dbc starts here";
 BO_ 359 STEERING_IPAS_COMMA: 8 IPAS
  SG_ STATE : 7|4@0+ (1,0) [0|15] "" XXX
  SG_ ANGLE : 3|12@0- (1.5,0) [-510|510] "deg" XXX
@@ -29,7 +29,7 @@ BO_ 359 STEERING_IPAS_COMMA: 8 IPAS
  SG_ SET_ME_X00 : 55|8@0+ (1,0) [0|255] "" XXX
  SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
 
-CM BO_ STEERING_IPAS_COMMA "Copy of msg 614 so we can do angle control while the Park Assist ECU is connected (Panda spoofs 614 with 359 on connector J70). Note that addresses 0x266 and 0x167 are checksum-invariant";
+CM_ "BO_ STEERING_IPAS_COMMA: Copy of msg 614 so we can do angle control while the Park Assist ECU is connected (Panda spoofs 614 with 359 on connector J70). Note that addresses 0x266 and 0x167 are checksum-invariant";
 
  BO_ 512 GAS_COMMAND: 6 EON
   SG_ GAS_COMMAND : 7|16@0+ (0.159375,-75.555) [0|1] "" INTERCEPTOR
@@ -50,10 +50,10 @@ CM BO_ STEERING_IPAS_COMMA "Copy of msg 614 so we can do angle control while the
 BO_ 35 SECONDARY_STEER_ANGLE: 8 XXX
  SG_ ZORRO_STEER : 7|24@0- (0.004901594652,0) [-500|500] "" XXX
 
-CM BO_ SECONDARY_STEER_ANGLE "ZSS is a high-precision steering angle sensor that can replace the lower resolution sensor in most TSS1 Toyotas. Learn more: https://github.com/commaai/openpilot/wiki/Toyota-Lexus#zorro-steering-sensor-zss";
+CM_ "BO_ SECONDARY_STEER_ANGLE: ZSS is a high-precision steering angle sensor that can replace the lower resolution sensor in most TSS1 Toyotas. Learn more: https://github.com/commaai/openpilot/wiki/Toyota-Lexus#zorro-steering-sensor-zss";
 
 
-CM_ "Imported file _toyota_2017.dbc starts here"
+CM_ "Imported file _toyota_2017.dbc starts here";
 VERSION ""
 
 
@@ -342,7 +342,7 @@ CM_ SG_ 614 ANGLE "set to measured angle when ipas control isn't active";
 CM_ SG_ 643 COUNTER "only used on cars that use this msg for cruise control";
 CM_ SG_ 643 BRAKE_STATUS "only used on cars that use this msg for cruise control";
 CM_ SG_ 643 PRECOLLISION_ACTIVE "set 0.5s before any braking";
-CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was "SET_ME_1" and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG.";
+CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was 'SET_ME_1' and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG.";
 CM_ SG_ 835 ACCEL_CMD_ALT "Copy of main ACCEL_CMD, but across 8 bits instead of 16 bits like ACCEL_CMD. Unsure if only informational or has an effect. Likely informational as existing openpilot sets this to 0 and no loss of functionality observed. Originally 'AT_RAW' in leaked toyota_2017_ref_pt.dbc file.";
 CM_ SG_ 921 UI_SET_SPEED "set speed shown in UI with user set unit";
 CM_ SG_ 951 BRAKE_LIGHTS_ACC "brake lights when ACC commands decel";
@@ -350,7 +350,7 @@ CM_ SG_ 1042 SET_ME_1 "unclear what this is, but it's always 1 in drive traces";
 CM_ SG_ 1042 REPEATED_BEEPS "recommended for fcw and other important alerts";
 CM_ SG_ 1161 SPDVAL1 "Numbers 0-199 is displayed, 200-254 displays circle without number and 255 is for no limit.";
 CM_ SG_ 1161 SYNCID1 "counter from 1 to f at 1 Hz";
-CM_ SG_ 1161 SPDVAL2 "conditional speed value 70"
+CM_ SG_ 1161 SPDVAL2 "conditional speed value 70";
 CM_ SG_ 1162 SGNNUMP "1 if SPDVAL1 is set, otherwise 0";
 CM_ SG_ 1162 SYNCID2 "counter from 1 to f at 1 Hz";
 CM_ SG_ 1163 TSREQPD "always 1";
@@ -384,7 +384,7 @@ VAL_ 1162 SPLSGN3 15 "conditional blank" 4 "wet road" 5 "rain" 0 "none";
 
 CM_ "CHFFR_METRIC 37 STEER_ANGLE STEER_ANGLE 0.36 180";
 
-CM_ "toyota_nodsu_hybrid_pt.dbc starts here"
+CM_ "toyota_nodsu_hybrid_pt.dbc starts here";
 
 
 
diff --git a/toyota_nodsu_pt_generated.dbc b/toyota_nodsu_pt_generated.dbc
index e2729ab..63cf1cb 100644
--- a/toyota_nodsu_pt_generated.dbc
+++ b/toyota_nodsu_pt_generated.dbc
@@ -1,7 +1,7 @@
-CM_ "AUTOGENERATED FILE, DO NOT EDIT"
+CM_ "AUTOGENERATED FILE, DO NOT EDIT";
 
 
-CM_ "Imported file _toyota_nodsu_bsm.dbc starts here"
+CM_ "Imported file _toyota_nodsu_bsm.dbc starts here";
 BO_ 1014 BSM: 8 XXX
  SG_ L_ADJACENT : 0|1@0+ (1,0) [0|1] "" XXX
  SG_ L_APPROACHING : 8|1@0+ (1,0) [0|1] "" XXX
@@ -18,7 +18,7 @@ CM_ SG_ 1014 ADJACENT_ENABLED "when BSM is enabled in settings, this is on along
 CM_ SG_ 1014 APPROACHING_ENABLED "when BSM is enabled in settings, this is on along with ADJACENT_ENABLED. this controls bsm alert visibility";
 
 
-CM_ "Imported file _comma.dbc starts here"
+CM_ "Imported file _comma.dbc starts here";
 BO_ 359 STEERING_IPAS_COMMA: 8 IPAS
  SG_ STATE : 7|4@0+ (1,0) [0|15] "" XXX
  SG_ ANGLE : 3|12@0- (1.5,0) [-510|510] "deg" XXX
@@ -29,7 +29,7 @@ BO_ 359 STEERING_IPAS_COMMA: 8 IPAS
  SG_ SET_ME_X00 : 55|8@0+ (1,0) [0|255] "" XXX
  SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
 
-CM BO_ STEERING_IPAS_COMMA "Copy of msg 614 so we can do angle control while the Park Assist ECU is connected (Panda spoofs 614 with 359 on connector J70). Note that addresses 0x266 and 0x167 are checksum-invariant";
+CM_ "BO_ STEERING_IPAS_COMMA: Copy of msg 614 so we can do angle control while the Park Assist ECU is connected (Panda spoofs 614 with 359 on connector J70). Note that addresses 0x266 and 0x167 are checksum-invariant";
 
  BO_ 512 GAS_COMMAND: 6 EON
   SG_ GAS_COMMAND : 7|16@0+ (0.159375,-75.555) [0|1] "" INTERCEPTOR
@@ -50,10 +50,10 @@ CM BO_ STEERING_IPAS_COMMA "Copy of msg 614 so we can do angle control while the
 BO_ 35 SECONDARY_STEER_ANGLE: 8 XXX
  SG_ ZORRO_STEER : 7|24@0- (0.004901594652,0) [-500|500] "" XXX
 
-CM BO_ SECONDARY_STEER_ANGLE "ZSS is a high-precision steering angle sensor that can replace the lower resolution sensor in most TSS1 Toyotas. Learn more: https://github.com/commaai/openpilot/wiki/Toyota-Lexus#zorro-steering-sensor-zss";
+CM_ "BO_ SECONDARY_STEER_ANGLE: ZSS is a high-precision steering angle sensor that can replace the lower resolution sensor in most TSS1 Toyotas. Learn more: https://github.com/commaai/openpilot/wiki/Toyota-Lexus#zorro-steering-sensor-zss";
 
 
-CM_ "Imported file _toyota_2017.dbc starts here"
+CM_ "Imported file _toyota_2017.dbc starts here";
 VERSION ""
 
 
@@ -342,7 +342,7 @@ CM_ SG_ 614 ANGLE "set to measured angle when ipas control isn't active";
 CM_ SG_ 643 COUNTER "only used on cars that use this msg for cruise control";
 CM_ SG_ 643 BRAKE_STATUS "only used on cars that use this msg for cruise control";
 CM_ SG_ 643 PRECOLLISION_ACTIVE "set 0.5s before any braking";
-CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was "SET_ME_1" and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG.";
+CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was 'SET_ME_1' and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG.";
 CM_ SG_ 835 ACCEL_CMD_ALT "Copy of main ACCEL_CMD, but across 8 bits instead of 16 bits like ACCEL_CMD. Unsure if only informational or has an effect. Likely informational as existing openpilot sets this to 0 and no loss of functionality observed. Originally 'AT_RAW' in leaked toyota_2017_ref_pt.dbc file.";
 CM_ SG_ 921 UI_SET_SPEED "set speed shown in UI with user set unit";
 CM_ SG_ 951 BRAKE_LIGHTS_ACC "brake lights when ACC commands decel";
@@ -350,7 +350,7 @@ CM_ SG_ 1042 SET_ME_1 "unclear what this is, but it's always 1 in drive traces";
 CM_ SG_ 1042 REPEATED_BEEPS "recommended for fcw and other important alerts";
 CM_ SG_ 1161 SPDVAL1 "Numbers 0-199 is displayed, 200-254 displays circle without number and 255 is for no limit.";
 CM_ SG_ 1161 SYNCID1 "counter from 1 to f at 1 Hz";
-CM_ SG_ 1161 SPDVAL2 "conditional speed value 70"
+CM_ SG_ 1161 SPDVAL2 "conditional speed value 70";
 CM_ SG_ 1162 SGNNUMP "1 if SPDVAL1 is set, otherwise 0";
 CM_ SG_ 1162 SYNCID2 "counter from 1 to f at 1 Hz";
 CM_ SG_ 1163 TSREQPD "always 1";
@@ -384,7 +384,7 @@ VAL_ 1162 SPLSGN3 15 "conditional blank" 4 "wet road" 5 "rain" 0 "none";
 
 CM_ "CHFFR_METRIC 37 STEER_ANGLE STEER_ANGLE 0.36 180";
 
-CM_ "toyota_nodsu_pt.dbc starts here"
+CM_ "toyota_nodsu_pt.dbc starts here";
 
 
 
diff --git a/toyota_prius_2017_pt_generated.dbc b/toyota_prius_2017_pt_generated.dbc
index 0fbbf83..7bf5ab2 100644
--- a/toyota_prius_2017_pt_generated.dbc
+++ b/toyota_prius_2017_pt_generated.dbc
@@ -1,7 +1,7 @@
-CM_ "AUTOGENERATED FILE, DO NOT EDIT"
+CM_ "AUTOGENERATED FILE, DO NOT EDIT";
 
 
-CM_ "Imported file _comma.dbc starts here"
+CM_ "Imported file _comma.dbc starts here";
 BO_ 359 STEERING_IPAS_COMMA: 8 IPAS
  SG_ STATE : 7|4@0+ (1,0) [0|15] "" XXX
  SG_ ANGLE : 3|12@0- (1.5,0) [-510|510] "deg" XXX
@@ -12,7 +12,7 @@ BO_ 359 STEERING_IPAS_COMMA: 8 IPAS
  SG_ SET_ME_X00 : 55|8@0+ (1,0) [0|255] "" XXX
  SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
 
-CM BO_ STEERING_IPAS_COMMA "Copy of msg 614 so we can do angle control while the Park Assist ECU is connected (Panda spoofs 614 with 359 on connector J70). Note that addresses 0x266 and 0x167 are checksum-invariant";
+CM_ "BO_ STEERING_IPAS_COMMA: Copy of msg 614 so we can do angle control while the Park Assist ECU is connected (Panda spoofs 614 with 359 on connector J70). Note that addresses 0x266 and 0x167 are checksum-invariant";
 
  BO_ 512 GAS_COMMAND: 6 EON
   SG_ GAS_COMMAND : 7|16@0+ (0.159375,-75.555) [0|1] "" INTERCEPTOR
@@ -33,10 +33,10 @@ CM BO_ STEERING_IPAS_COMMA "Copy of msg 614 so we can do angle control while the
 BO_ 35 SECONDARY_STEER_ANGLE: 8 XXX
  SG_ ZORRO_STEER : 7|24@0- (0.004901594652,0) [-500|500] "" XXX
 
-CM BO_ SECONDARY_STEER_ANGLE "ZSS is a high-precision steering angle sensor that can replace the lower resolution sensor in most TSS1 Toyotas. Learn more: https://github.com/commaai/openpilot/wiki/Toyota-Lexus#zorro-steering-sensor-zss";
+CM_ "BO_ SECONDARY_STEER_ANGLE: ZSS is a high-precision steering angle sensor that can replace the lower resolution sensor in most TSS1 Toyotas. Learn more: https://github.com/commaai/openpilot/wiki/Toyota-Lexus#zorro-steering-sensor-zss";
 
 
-CM_ "Imported file _toyota_2017.dbc starts here"
+CM_ "Imported file _toyota_2017.dbc starts here";
 VERSION ""
 
 
@@ -325,7 +325,7 @@ CM_ SG_ 614 ANGLE "set to measured angle when ipas control isn't active";
 CM_ SG_ 643 COUNTER "only used on cars that use this msg for cruise control";
 CM_ SG_ 643 BRAKE_STATUS "only used on cars that use this msg for cruise control";
 CM_ SG_ 643 PRECOLLISION_ACTIVE "set 0.5s before any braking";
-CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was "SET_ME_1" and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG.";
+CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was 'SET_ME_1' and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG.";
 CM_ SG_ 835 ACCEL_CMD_ALT "Copy of main ACCEL_CMD, but across 8 bits instead of 16 bits like ACCEL_CMD. Unsure if only informational or has an effect. Likely informational as existing openpilot sets this to 0 and no loss of functionality observed. Originally 'AT_RAW' in leaked toyota_2017_ref_pt.dbc file.";
 CM_ SG_ 921 UI_SET_SPEED "set speed shown in UI with user set unit";
 CM_ SG_ 951 BRAKE_LIGHTS_ACC "brake lights when ACC commands decel";
@@ -333,7 +333,7 @@ CM_ SG_ 1042 SET_ME_1 "unclear what this is, but it's always 1 in drive traces";
 CM_ SG_ 1042 REPEATED_BEEPS "recommended for fcw and other important alerts";
 CM_ SG_ 1161 SPDVAL1 "Numbers 0-199 is displayed, 200-254 displays circle without number and 255 is for no limit.";
 CM_ SG_ 1161 SYNCID1 "counter from 1 to f at 1 Hz";
-CM_ SG_ 1161 SPDVAL2 "conditional speed value 70"
+CM_ SG_ 1161 SPDVAL2 "conditional speed value 70";
 CM_ SG_ 1162 SGNNUMP "1 if SPDVAL1 is set, otherwise 0";
 CM_ SG_ 1162 SYNCID2 "counter from 1 to f at 1 Hz";
 CM_ SG_ 1163 TSREQPD "always 1";
@@ -367,7 +367,7 @@ VAL_ 1162 SPLSGN3 15 "conditional blank" 4 "wet road" 5 "rain" 0 "none";
 
 CM_ "CHFFR_METRIC 37 STEER_ANGLE STEER_ANGLE 0.36 180";
 
-CM_ "toyota_prius_2017_pt.dbc starts here"
+CM_ "toyota_prius_2017_pt.dbc starts here";
 
 
 
diff --git a/toyota_rav4_2017_pt_generated.dbc b/toyota_rav4_2017_pt_generated.dbc
index 5c1cc82..0b61178 100644
--- a/toyota_rav4_2017_pt_generated.dbc
+++ b/toyota_rav4_2017_pt_generated.dbc
@@ -1,7 +1,7 @@
-CM_ "AUTOGENERATED FILE, DO NOT EDIT"
+CM_ "AUTOGENERATED FILE, DO NOT EDIT";
 
 
-CM_ "Imported file _comma.dbc starts here"
+CM_ "Imported file _comma.dbc starts here";
 BO_ 359 STEERING_IPAS_COMMA: 8 IPAS
  SG_ STATE : 7|4@0+ (1,0) [0|15] "" XXX
  SG_ ANGLE : 3|12@0- (1.5,0) [-510|510] "deg" XXX
@@ -12,7 +12,7 @@ BO_ 359 STEERING_IPAS_COMMA: 8 IPAS
  SG_ SET_ME_X00 : 55|8@0+ (1,0) [0|255] "" XXX
  SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
 
-CM BO_ STEERING_IPAS_COMMA "Copy of msg 614 so we can do angle control while the Park Assist ECU is connected (Panda spoofs 614 with 359 on connector J70). Note that addresses 0x266 and 0x167 are checksum-invariant";
+CM_ "BO_ STEERING_IPAS_COMMA: Copy of msg 614 so we can do angle control while the Park Assist ECU is connected (Panda spoofs 614 with 359 on connector J70). Note that addresses 0x266 and 0x167 are checksum-invariant";
 
  BO_ 512 GAS_COMMAND: 6 EON
   SG_ GAS_COMMAND : 7|16@0+ (0.159375,-75.555) [0|1] "" INTERCEPTOR
@@ -33,10 +33,10 @@ CM BO_ STEERING_IPAS_COMMA "Copy of msg 614 so we can do angle control while the
 BO_ 35 SECONDARY_STEER_ANGLE: 8 XXX
  SG_ ZORRO_STEER : 7|24@0- (0.004901594652,0) [-500|500] "" XXX
 
-CM BO_ SECONDARY_STEER_ANGLE "ZSS is a high-precision steering angle sensor that can replace the lower resolution sensor in most TSS1 Toyotas. Learn more: https://github.com/commaai/openpilot/wiki/Toyota-Lexus#zorro-steering-sensor-zss";
+CM_ "BO_ SECONDARY_STEER_ANGLE: ZSS is a high-precision steering angle sensor that can replace the lower resolution sensor in most TSS1 Toyotas. Learn more: https://github.com/commaai/openpilot/wiki/Toyota-Lexus#zorro-steering-sensor-zss";
 
 
-CM_ "Imported file _toyota_2017.dbc starts here"
+CM_ "Imported file _toyota_2017.dbc starts here";
 VERSION ""
 
 
@@ -325,7 +325,7 @@ CM_ SG_ 614 ANGLE "set to measured angle when ipas control isn't active";
 CM_ SG_ 643 COUNTER "only used on cars that use this msg for cruise control";
 CM_ SG_ 643 BRAKE_STATUS "only used on cars that use this msg for cruise control";
 CM_ SG_ 643 PRECOLLISION_ACTIVE "set 0.5s before any braking";
-CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was "SET_ME_1" and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG.";
+CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was 'SET_ME_1' and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG.";
 CM_ SG_ 835 ACCEL_CMD_ALT "Copy of main ACCEL_CMD, but across 8 bits instead of 16 bits like ACCEL_CMD. Unsure if only informational or has an effect. Likely informational as existing openpilot sets this to 0 and no loss of functionality observed. Originally 'AT_RAW' in leaked toyota_2017_ref_pt.dbc file.";
 CM_ SG_ 921 UI_SET_SPEED "set speed shown in UI with user set unit";
 CM_ SG_ 951 BRAKE_LIGHTS_ACC "brake lights when ACC commands decel";
@@ -333,7 +333,7 @@ CM_ SG_ 1042 SET_ME_1 "unclear what this is, but it's always 1 in drive traces";
 CM_ SG_ 1042 REPEATED_BEEPS "recommended for fcw and other important alerts";
 CM_ SG_ 1161 SPDVAL1 "Numbers 0-199 is displayed, 200-254 displays circle without number and 255 is for no limit.";
 CM_ SG_ 1161 SYNCID1 "counter from 1 to f at 1 Hz";
-CM_ SG_ 1161 SPDVAL2 "conditional speed value 70"
+CM_ SG_ 1161 SPDVAL2 "conditional speed value 70";
 CM_ SG_ 1162 SGNNUMP "1 if SPDVAL1 is set, otherwise 0";
 CM_ SG_ 1162 SYNCID2 "counter from 1 to f at 1 Hz";
 CM_ SG_ 1163 TSREQPD "always 1";
@@ -367,7 +367,7 @@ VAL_ 1162 SPLSGN3 15 "conditional blank" 4 "wet road" 5 "rain" 0 "none";
 
 CM_ "CHFFR_METRIC 37 STEER_ANGLE STEER_ANGLE 0.36 180";
 
-CM_ "toyota_rav4_2017_pt.dbc starts here"
+CM_ "toyota_rav4_2017_pt.dbc starts here";
 
 
 
diff --git a/toyota_rav4_hybrid_2017_pt_generated.dbc b/toyota_rav4_hybrid_2017_pt_generated.dbc
index 6ad9c80..5e4e8c3 100644
--- a/toyota_rav4_hybrid_2017_pt_generated.dbc
+++ b/toyota_rav4_hybrid_2017_pt_generated.dbc
@@ -1,7 +1,7 @@
-CM_ "AUTOGENERATED FILE, DO NOT EDIT"
+CM_ "AUTOGENERATED FILE, DO NOT EDIT";
 
 
-CM_ "Imported file _comma.dbc starts here"
+CM_ "Imported file _comma.dbc starts here";
 BO_ 359 STEERING_IPAS_COMMA: 8 IPAS
  SG_ STATE : 7|4@0+ (1,0) [0|15] "" XXX
  SG_ ANGLE : 3|12@0- (1.5,0) [-510|510] "deg" XXX
@@ -12,7 +12,7 @@ BO_ 359 STEERING_IPAS_COMMA: 8 IPAS
  SG_ SET_ME_X00 : 55|8@0+ (1,0) [0|255] "" XXX
  SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
 
-CM BO_ STEERING_IPAS_COMMA "Copy of msg 614 so we can do angle control while the Park Assist ECU is connected (Panda spoofs 614 with 359 on connector J70). Note that addresses 0x266 and 0x167 are checksum-invariant";
+CM_ "BO_ STEERING_IPAS_COMMA: Copy of msg 614 so we can do angle control while the Park Assist ECU is connected (Panda spoofs 614 with 359 on connector J70). Note that addresses 0x266 and 0x167 are checksum-invariant";
 
  BO_ 512 GAS_COMMAND: 6 EON
   SG_ GAS_COMMAND : 7|16@0+ (0.159375,-75.555) [0|1] "" INTERCEPTOR
@@ -33,10 +33,10 @@ CM BO_ STEERING_IPAS_COMMA "Copy of msg 614 so we can do angle control while the
 BO_ 35 SECONDARY_STEER_ANGLE: 8 XXX
  SG_ ZORRO_STEER : 7|24@0- (0.004901594652,0) [-500|500] "" XXX
 
-CM BO_ SECONDARY_STEER_ANGLE "ZSS is a high-precision steering angle sensor that can replace the lower resolution sensor in most TSS1 Toyotas. Learn more: https://github.com/commaai/openpilot/wiki/Toyota-Lexus#zorro-steering-sensor-zss";
+CM_ "BO_ SECONDARY_STEER_ANGLE: ZSS is a high-precision steering angle sensor that can replace the lower resolution sensor in most TSS1 Toyotas. Learn more: https://github.com/commaai/openpilot/wiki/Toyota-Lexus#zorro-steering-sensor-zss";
 
 
-CM_ "Imported file _toyota_2017.dbc starts here"
+CM_ "Imported file _toyota_2017.dbc starts here";
 VERSION ""
 
 
@@ -325,7 +325,7 @@ CM_ SG_ 614 ANGLE "set to measured angle when ipas control isn't active";
 CM_ SG_ 643 COUNTER "only used on cars that use this msg for cruise control";
 CM_ SG_ 643 BRAKE_STATUS "only used on cars that use this msg for cruise control";
 CM_ SG_ 643 PRECOLLISION_ACTIVE "set 0.5s before any braking";
-CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was "SET_ME_1" and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG.";
+CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was 'SET_ME_1' and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG.";
 CM_ SG_ 835 ACCEL_CMD_ALT "Copy of main ACCEL_CMD, but across 8 bits instead of 16 bits like ACCEL_CMD. Unsure if only informational or has an effect. Likely informational as existing openpilot sets this to 0 and no loss of functionality observed. Originally 'AT_RAW' in leaked toyota_2017_ref_pt.dbc file.";
 CM_ SG_ 921 UI_SET_SPEED "set speed shown in UI with user set unit";
 CM_ SG_ 951 BRAKE_LIGHTS_ACC "brake lights when ACC commands decel";
@@ -333,7 +333,7 @@ CM_ SG_ 1042 SET_ME_1 "unclear what this is, but it's always 1 in drive traces";
 CM_ SG_ 1042 REPEATED_BEEPS "recommended for fcw and other important alerts";
 CM_ SG_ 1161 SPDVAL1 "Numbers 0-199 is displayed, 200-254 displays circle without number and 255 is for no limit.";
 CM_ SG_ 1161 SYNCID1 "counter from 1 to f at 1 Hz";
-CM_ SG_ 1161 SPDVAL2 "conditional speed value 70"
+CM_ SG_ 1161 SPDVAL2 "conditional speed value 70";
 CM_ SG_ 1162 SGNNUMP "1 if SPDVAL1 is set, otherwise 0";
 CM_ SG_ 1162 SYNCID2 "counter from 1 to f at 1 Hz";
 CM_ SG_ 1163 TSREQPD "always 1";
@@ -367,7 +367,7 @@ VAL_ 1162 SPLSGN3 15 "conditional blank" 4 "wet road" 5 "rain" 0 "none";
 
 CM_ "CHFFR_METRIC 37 STEER_ANGLE STEER_ANGLE 0.36 180";
 
-CM_ "toyota_rav4_hybrid_2017_pt.dbc starts here"
+CM_ "toyota_rav4_hybrid_2017_pt.dbc starts here";
 
 
 
diff --git a/toyota_sienna_xle_2018_pt_generated.dbc b/toyota_sienna_xle_2018_pt_generated.dbc
index 4311ce9..66bbbe1 100644
--- a/toyota_sienna_xle_2018_pt_generated.dbc
+++ b/toyota_sienna_xle_2018_pt_generated.dbc
@@ -1,7 +1,7 @@
-CM_ "AUTOGENERATED FILE, DO NOT EDIT"
+CM_ "AUTOGENERATED FILE, DO NOT EDIT";
 
 
-CM_ "Imported file _comma.dbc starts here"
+CM_ "Imported file _comma.dbc starts here";
 BO_ 359 STEERING_IPAS_COMMA: 8 IPAS
  SG_ STATE : 7|4@0+ (1,0) [0|15] "" XXX
  SG_ ANGLE : 3|12@0- (1.5,0) [-510|510] "deg" XXX
@@ -12,7 +12,7 @@ BO_ 359 STEERING_IPAS_COMMA: 8 IPAS
  SG_ SET_ME_X00 : 55|8@0+ (1,0) [0|255] "" XXX
  SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
 
-CM BO_ STEERING_IPAS_COMMA "Copy of msg 614 so we can do angle control while the Park Assist ECU is connected (Panda spoofs 614 with 359 on connector J70). Note that addresses 0x266 and 0x167 are checksum-invariant";
+CM_ "BO_ STEERING_IPAS_COMMA: Copy of msg 614 so we can do angle control while the Park Assist ECU is connected (Panda spoofs 614 with 359 on connector J70). Note that addresses 0x266 and 0x167 are checksum-invariant";
 
  BO_ 512 GAS_COMMAND: 6 EON
   SG_ GAS_COMMAND : 7|16@0+ (0.159375,-75.555) [0|1] "" INTERCEPTOR
@@ -33,10 +33,10 @@ CM BO_ STEERING_IPAS_COMMA "Copy of msg 614 so we can do angle control while the
 BO_ 35 SECONDARY_STEER_ANGLE: 8 XXX
  SG_ ZORRO_STEER : 7|24@0- (0.004901594652,0) [-500|500] "" XXX
 
-CM BO_ SECONDARY_STEER_ANGLE "ZSS is a high-precision steering angle sensor that can replace the lower resolution sensor in most TSS1 Toyotas. Learn more: https://github.com/commaai/openpilot/wiki/Toyota-Lexus#zorro-steering-sensor-zss";
+CM_ "BO_ SECONDARY_STEER_ANGLE: ZSS is a high-precision steering angle sensor that can replace the lower resolution sensor in most TSS1 Toyotas. Learn more: https://github.com/commaai/openpilot/wiki/Toyota-Lexus#zorro-steering-sensor-zss";
 
 
-CM_ "Imported file _toyota_2017.dbc starts here"
+CM_ "Imported file _toyota_2017.dbc starts here";
 VERSION ""
 
 
@@ -325,7 +325,7 @@ CM_ SG_ 614 ANGLE "set to measured angle when ipas control isn't active";
 CM_ SG_ 643 COUNTER "only used on cars that use this msg for cruise control";
 CM_ SG_ 643 BRAKE_STATUS "only used on cars that use this msg for cruise control";
 CM_ SG_ 643 PRECOLLISION_ACTIVE "set 0.5s before any braking";
-CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was "SET_ME_1" and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG.";
+CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was 'SET_ME_1' and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG.";
 CM_ SG_ 835 ACCEL_CMD_ALT "Copy of main ACCEL_CMD, but across 8 bits instead of 16 bits like ACCEL_CMD. Unsure if only informational or has an effect. Likely informational as existing openpilot sets this to 0 and no loss of functionality observed. Originally 'AT_RAW' in leaked toyota_2017_ref_pt.dbc file.";
 CM_ SG_ 921 UI_SET_SPEED "set speed shown in UI with user set unit";
 CM_ SG_ 951 BRAKE_LIGHTS_ACC "brake lights when ACC commands decel";
@@ -333,7 +333,7 @@ CM_ SG_ 1042 SET_ME_1 "unclear what this is, but it's always 1 in drive traces";
 CM_ SG_ 1042 REPEATED_BEEPS "recommended for fcw and other important alerts";
 CM_ SG_ 1161 SPDVAL1 "Numbers 0-199 is displayed, 200-254 displays circle without number and 255 is for no limit.";
 CM_ SG_ 1161 SYNCID1 "counter from 1 to f at 1 Hz";
-CM_ SG_ 1161 SPDVAL2 "conditional speed value 70"
+CM_ SG_ 1161 SPDVAL2 "conditional speed value 70";
 CM_ SG_ 1162 SGNNUMP "1 if SPDVAL1 is set, otherwise 0";
 CM_ SG_ 1162 SYNCID2 "counter from 1 to f at 1 Hz";
 CM_ SG_ 1163 TSREQPD "always 1";
@@ -367,7 +367,7 @@ VAL_ 1162 SPLSGN3 15 "conditional blank" 4 "wet road" 5 "rain" 0 "none";
 
 CM_ "CHFFR_METRIC 37 STEER_ANGLE STEER_ANGLE 0.36 180";
 
-CM_ "toyota_sienna_xle_2018_pt.dbc starts here"
+CM_ "toyota_sienna_xle_2018_pt.dbc starts here";