diff --git a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h
index 10d1ef85f9..baeba3b20d 100644
--- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h
+++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h
@@ -1,4 +1,4 @@
-// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Jun 30 19:19:37 UTC 2020
+// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Jul 01 01:01:17 UTC 2020
 // by class com.rusefi.output.CHeaderConsumer
 // begin
 #ifndef CONFIG_BOARDS_KINETIS_CONFIG_CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H
@@ -197,7 +197,7 @@ struct gppwm_channel {
 	/**
 	 * offset 7
 	 */
-	uint8_t alignmentFill;
+	uint8_t alignmentFill_map;
 	/**
 	 * offset 8
 	 */
@@ -3522,4 +3522,4 @@ typedef struct persistent_config_s persistent_config_s;
 
 #endif
 // end
-// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Jun 30 19:19:37 UTC 2020
+// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Jul 01 01:01:17 UTC 2020
diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h
index 7c1d950df5..4c94539971 100644
--- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h
+++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h
@@ -326,6 +326,7 @@
 #define ET_FRANKENSO_MIATA_NA6 41
 #define ET_FRANKENSO_MIATA_NA6_VAF 57
 #define ET_FRANKENSO_MIATA_NB2 47
+#define ET_MRE_DEFAULTS 60
 #define ET_MRE_MIATA_NA6 12
 #define ET_MRE_MIATA_NB2_MAF 15
 #define ET_MRE_MIATA_NB2_MAP 11
@@ -606,7 +607,7 @@
 #define gpioPinModes7_offset 770
 #define gpioPinModes8_offset 771
 #define gpioPinModes9_offset 772
-#define gppwm1_alignmentFill_offset 4151
+#define gppwm1_alignmentFill_map_offset 4151
 #define gppwm1_dutyIfError_offset 4145
 #define gppwm1_loadAxis_offset 4150
 #define gppwm1_loadBins_offset 4152
@@ -617,7 +618,7 @@
 #define gppwm1_pwmFrequency_offset 4146
 #define gppwm1_rpmBins_offset 4160
 #define gppwm1_table_offset 4168
-#define gppwm2_alignmentFill_offset 4239
+#define gppwm2_alignmentFill_map_offset 4239
 #define gppwm2_dutyIfError_offset 4233
 #define gppwm2_loadAxis_offset 4238
 #define gppwm2_loadBins_offset 4240
@@ -628,7 +629,7 @@
 #define gppwm2_pwmFrequency_offset 4234
 #define gppwm2_rpmBins_offset 4248
 #define gppwm2_table_offset 4256
-#define gppwm3_alignmentFill_offset 4327
+#define gppwm3_alignmentFill_map_offset 4327
 #define gppwm3_dutyIfError_offset 4321
 #define gppwm3_loadAxis_offset 4326
 #define gppwm3_loadBins_offset 4328
@@ -639,7 +640,7 @@
 #define gppwm3_pwmFrequency_offset 4322
 #define gppwm3_rpmBins_offset 4336
 #define gppwm3_table_offset 4344
-#define gppwm4_alignmentFill_offset 4415
+#define gppwm4_alignmentFill_map_offset 4415
 #define gppwm4_dutyIfError_offset 4409
 #define gppwm4_loadAxis_offset 4414
 #define gppwm4_loadBins_offset 4416
@@ -1057,8 +1058,8 @@
 #define showHumanReadableWarning_offset 976
 #define showSdCardWarning_offset 76
 #define SIGNATURE_BOARD kin
-#define SIGNATURE_DATE 2020.06.30
-#define SIGNATURE_HASH 831009872
+#define SIGNATURE_DATE 2020.07.01
+#define SIGNATURE_HASH 82634164
 #define silentTriggerError_offset 1464
 #define slowAdcAlpha_offset 2088
 #define sparkDwellRpmBins_offset 332
@@ -1318,7 +1319,7 @@
 #define ts_show_spi true
 #define ts_show_trigger_comparator true
 #define ts_show_tunerstudio_port true
-#define TS_SIGNATURE "rusEFI 2020.06.30.kin.831009872"
+#define TS_SIGNATURE "rusEFI 2020.07.01.kin.82634164"
 #define TS_SINGLE_WRITE_COMMAND 'W'
 #define tunerStudioSerialSpeed_offset 728
 #define twoWireBatchIgnition_offset 1476
diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h
index cb27434c05..4f8948a456 100644
--- a/firmware/controllers/generated/engine_configuration_generated_structures.h
+++ b/firmware/controllers/generated/engine_configuration_generated_structures.h
@@ -1,4 +1,4 @@
-// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 30 19:19:29 UTC 2020
+// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 01 01:01:09 UTC 2020
 // by class com.rusefi.output.CHeaderConsumer
 // begin
 #ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H
@@ -197,7 +197,7 @@ struct gppwm_channel {
 	/**
 	 * offset 7
 	 */
-	uint8_t alignmentFill;
+	uint8_t alignmentFill_map;
 	/**
 	 * offset 8
 	 */
@@ -3522,4 +3522,4 @@ typedef struct persistent_config_s persistent_config_s;
 
 #endif
 // end
-// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 30 19:19:29 UTC 2020
+// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 01 01:01:09 UTC 2020
diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def
index a861c5514f..6f5a182d96 100644
--- a/firmware/controllers/generated/fsio_enums_generated.def
+++ b/firmware/controllers/generated/fsio_enums_generated.def
@@ -1,4 +1,4 @@
-// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 30 19:19:29 UTC 2020
+// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 01 01:01:09 UTC 2020
 
 // by class com.rusefi.output.FileFsioSettingsConsumer
 	FSIO_SETTING_FANONTEMPERATURE = 1000,
diff --git a/firmware/controllers/generated/fsio_getters.def b/firmware/controllers/generated/fsio_getters.def
index 0d3a3027b6..dfef2bae69 100644
--- a/firmware/controllers/generated/fsio_getters.def
+++ b/firmware/controllers/generated/fsio_getters.def
@@ -1,4 +1,4 @@
-// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 30 19:19:29 UTC 2020
+// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 01 01:01:09 UTC 2020
 
 // by class com.rusefi.output.FileFsioSettingsConsumer
 	case FSIO_SETTING_FANONTEMPERATURE:
diff --git a/firmware/controllers/generated/fsio_names.def b/firmware/controllers/generated/fsio_names.def
index 1c7c7685f9..9a1c0b54d5 100644
--- a/firmware/controllers/generated/fsio_names.def
+++ b/firmware/controllers/generated/fsio_names.def
@@ -1,4 +1,4 @@
-// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 30 19:19:29 UTC 2020
+// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 01 01:01:09 UTC 2020
 
 // by class com.rusefi.output.FileFsioSettingsConsumer
 static LENameOrdinalPair lefanOnTemperature(FSIO_SETTING_FANONTEMPERATURE, "cfg_fanOnTemperature");
diff --git a/firmware/controllers/generated/fsio_strings.def b/firmware/controllers/generated/fsio_strings.def
index 769de9b82e..1cc9ea6ef3 100644
--- a/firmware/controllers/generated/fsio_strings.def
+++ b/firmware/controllers/generated/fsio_strings.def
@@ -1,4 +1,4 @@
-// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 30 19:19:29 UTC 2020
+// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 01 01:01:09 UTC 2020
 
 // by class com.rusefi.output.FileFsioSettingsConsumer
 	case FSIO_SETTING_FANONTEMPERATURE:
diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h
index 9df5707ff0..67a6f80a62 100644
--- a/firmware/controllers/generated/rusefi_generated.h
+++ b/firmware/controllers/generated/rusefi_generated.h
@@ -326,6 +326,7 @@
 #define ET_FRANKENSO_MIATA_NA6 41
 #define ET_FRANKENSO_MIATA_NA6_VAF 57
 #define ET_FRANKENSO_MIATA_NB2 47
+#define ET_MRE_DEFAULTS 60
 #define ET_MRE_MIATA_NA6 12
 #define ET_MRE_MIATA_NB2_MAF 15
 #define ET_MRE_MIATA_NB2_MAP 11
@@ -606,7 +607,7 @@
 #define gpioPinModes7_offset 770
 #define gpioPinModes8_offset 771
 #define gpioPinModes9_offset 772
-#define gppwm1_alignmentFill_offset 4151
+#define gppwm1_alignmentFill_map_offset 4151
 #define gppwm1_dutyIfError_offset 4145
 #define gppwm1_loadAxis_offset 4150
 #define gppwm1_loadBins_offset 4152
@@ -617,7 +618,7 @@
 #define gppwm1_pwmFrequency_offset 4146
 #define gppwm1_rpmBins_offset 4160
 #define gppwm1_table_offset 4168
-#define gppwm2_alignmentFill_offset 4239
+#define gppwm2_alignmentFill_map_offset 4239
 #define gppwm2_dutyIfError_offset 4233
 #define gppwm2_loadAxis_offset 4238
 #define gppwm2_loadBins_offset 4240
@@ -628,7 +629,7 @@
 #define gppwm2_pwmFrequency_offset 4234
 #define gppwm2_rpmBins_offset 4248
 #define gppwm2_table_offset 4256
-#define gppwm3_alignmentFill_offset 4327
+#define gppwm3_alignmentFill_map_offset 4327
 #define gppwm3_dutyIfError_offset 4321
 #define gppwm3_loadAxis_offset 4326
 #define gppwm3_loadBins_offset 4328
@@ -639,7 +640,7 @@
 #define gppwm3_pwmFrequency_offset 4322
 #define gppwm3_rpmBins_offset 4336
 #define gppwm3_table_offset 4344
-#define gppwm4_alignmentFill_offset 4415
+#define gppwm4_alignmentFill_map_offset 4415
 #define gppwm4_dutyIfError_offset 4409
 #define gppwm4_loadAxis_offset 4414
 #define gppwm4_loadBins_offset 4416
@@ -1057,8 +1058,8 @@
 #define showHumanReadableWarning_offset 976
 #define showSdCardWarning_offset 76
 #define SIGNATURE_BOARD all
-#define SIGNATURE_DATE 2020.06.30
-#define SIGNATURE_HASH 309701893
+#define SIGNATURE_DATE 2020.07.01
+#define SIGNATURE_HASH 129680412
 #define silentTriggerError_offset 1464
 #define slowAdcAlpha_offset 2088
 #define sparkDwellRpmBins_offset 332
@@ -1318,7 +1319,7 @@
 #define ts_show_spi true
 #define ts_show_trigger_comparator false
 #define ts_show_tunerstudio_port true
-#define TS_SIGNATURE "rusEFI 2020.06.30.all.309701893"
+#define TS_SIGNATURE "rusEFI 2020.07.01.all.129680412"
 #define TS_SINGLE_WRITE_COMMAND 'W'
 #define tunerStudioSerialSpeed_offset 728
 #define twoWireBatchIgnition_offset 1476
diff --git a/firmware/tunerstudio/cache/frankenso/rusefi_config.txt b/firmware/tunerstudio/cache/frankenso/rusefi_config.txt
index 18c6890c44..4494b49640 100644
--- a/firmware/tunerstudio/cache/frankenso/rusefi_config.txt
+++ b/firmware/tunerstudio/cache/frankenso/rusefi_config.txt
@@ -304,7 +304,7 @@ struct gppwm_channel
 	uint8_t offBelowDuty;+In on-off mode, turn the output off when the table value is below this duty.;"%", 1, 0, 0, 100, 0
 
 	gppwm_channel_e loadAxis;+Selects the load axis to use for the table.;
-	uint8_t[1] alignmentFill;
+	uint8_t alignmentFill_map;;"unit",      1,     0,    0, 100,     0
 
 	uint8_t[GPPWM_LOAD_COUNT] loadBins;;"load",      1,     0,   0.0,    250,   0
 	uint8_t[GPPWM_RPM_COUNT] rpmBins;;"RPM",  @@RPM_1_BYTE_PACKING_MULT@@,     0,      0.0,   12000.0,   0
@@ -324,7 +324,7 @@ float lowValue;kPa value at low volts;"kpa",      1,     0,    -400, 800,     2
 float highValue;kPa value at high volts;"kpa",      1,     0,    -400, 800,     2
 air_pressure_sensor_type_e type;
 adc_channel_e hwChannel;
-uint8_t[3] alignmentFill;
+uint8_t[3] alignmentFill;;"unit",      1,     0,    0, 100,     0
 
 end_struct
 
@@ -349,7 +349,7 @@ end_struct
 
 struct oil_pressure_config_s @brief Oil pressure sensor interpolation
 	adc_channel_e hwChannel;
-	uint8_t[3] alignmentFill;
+	uint8_t[3] alignmentFill;;"unit",      1,     0,    0, 100,     0
 	float v1;;         "volts",    1,    0.0,       0,    10.0,        2
 	float value1;;     "kPa",    1,      0.0,       0,  1000.0,        2
 	float v2;;         "volts",    1,    0.0,       0,    10.0,        2
@@ -557,7 +557,7 @@ float globalFuelCorrection;set global_fuel_correction X;"coef",    1,      0.0,
 	
 struct afr_sensor_s
 	adc_channel_e hwChannel;
-uint8_t[3] alignmentFill_afr;
+uint8_t[3] alignmentFill_afr;;"unit",      1,     0,    0, 100,     0
 	float v1;;         "volts",    1,    0.0,       0,    10.0,        2
 	float value1;;     "AFR",    1,      0.0,       0,  1000.0,        2
 	float v2;;         "volts",    1,    0.0,       0,    10.0,        2
@@ -1315,7 +1315,6 @@ float[AFTERSTART_HOLD_CURVE_SIZE] afterstartHoldTime;;"Seconds",        1,     0
 float[AFTERSTART_ENRICH_CURVE_SIZE] afterstartEnrich;;"%",              1,     0,      0,    600,   1
 float[AFTERSTART_DECAY_CURVE_SIZE] afterstartDecayTime;;"Seconds",      1,     0,      0,    100,   1
 
-
 boost_table_t boostTableOpenLoop;
 uint8_t[8] unused6312;;"units", 1, 0, -20, 100, 0
 uint8_t[BOOST_RPM_COUNT] boostRpmBins;;"RPM",   @@RPM_1_BYTE_PACKING_MULT@@,     0,      0.0,   12000.0,   0 
@@ -1636,6 +1635,8 @@ end_struct
 #define ET_MRE_MIATA_NB2_MAF 15
 #define ET_MRE_OLD_TEST_BOARD 30
 #define ET_MRE_NEW_TEST_BOARD 31
+#define ET_MRE_DEFAULTS 60
+
 #define ET_FRANKENSO_MIATA_NA6 41
 #define ET_FRANKENSO_MIATA_NB2 47
 #define ET_FRANKENSO_MIATA_NA6_VAF 57
diff --git a/firmware/tunerstudio/cache/kinetis/rusefi_config.txt b/firmware/tunerstudio/cache/kinetis/rusefi_config.txt
index 18c6890c44..4494b49640 100644
--- a/firmware/tunerstudio/cache/kinetis/rusefi_config.txt
+++ b/firmware/tunerstudio/cache/kinetis/rusefi_config.txt
@@ -304,7 +304,7 @@ struct gppwm_channel
 	uint8_t offBelowDuty;+In on-off mode, turn the output off when the table value is below this duty.;"%", 1, 0, 0, 100, 0
 
 	gppwm_channel_e loadAxis;+Selects the load axis to use for the table.;
-	uint8_t[1] alignmentFill;
+	uint8_t alignmentFill_map;;"unit",      1,     0,    0, 100,     0
 
 	uint8_t[GPPWM_LOAD_COUNT] loadBins;;"load",      1,     0,   0.0,    250,   0
 	uint8_t[GPPWM_RPM_COUNT] rpmBins;;"RPM",  @@RPM_1_BYTE_PACKING_MULT@@,     0,      0.0,   12000.0,   0
@@ -324,7 +324,7 @@ float lowValue;kPa value at low volts;"kpa",      1,     0,    -400, 800,     2
 float highValue;kPa value at high volts;"kpa",      1,     0,    -400, 800,     2
 air_pressure_sensor_type_e type;
 adc_channel_e hwChannel;
-uint8_t[3] alignmentFill;
+uint8_t[3] alignmentFill;;"unit",      1,     0,    0, 100,     0
 
 end_struct
 
@@ -349,7 +349,7 @@ end_struct
 
 struct oil_pressure_config_s @brief Oil pressure sensor interpolation
 	adc_channel_e hwChannel;
-	uint8_t[3] alignmentFill;
+	uint8_t[3] alignmentFill;;"unit",      1,     0,    0, 100,     0
 	float v1;;         "volts",    1,    0.0,       0,    10.0,        2
 	float value1;;     "kPa",    1,      0.0,       0,  1000.0,        2
 	float v2;;         "volts",    1,    0.0,       0,    10.0,        2
@@ -557,7 +557,7 @@ float globalFuelCorrection;set global_fuel_correction X;"coef",    1,      0.0,
 	
 struct afr_sensor_s
 	adc_channel_e hwChannel;
-uint8_t[3] alignmentFill_afr;
+uint8_t[3] alignmentFill_afr;;"unit",      1,     0,    0, 100,     0
 	float v1;;         "volts",    1,    0.0,       0,    10.0,        2
 	float value1;;     "AFR",    1,      0.0,       0,  1000.0,        2
 	float v2;;         "volts",    1,    0.0,       0,    10.0,        2
@@ -1315,7 +1315,6 @@ float[AFTERSTART_HOLD_CURVE_SIZE] afterstartHoldTime;;"Seconds",        1,     0
 float[AFTERSTART_ENRICH_CURVE_SIZE] afterstartEnrich;;"%",              1,     0,      0,    600,   1
 float[AFTERSTART_DECAY_CURVE_SIZE] afterstartDecayTime;;"Seconds",      1,     0,      0,    100,   1
 
-
 boost_table_t boostTableOpenLoop;
 uint8_t[8] unused6312;;"units", 1, 0, -20, 100, 0
 uint8_t[BOOST_RPM_COUNT] boostRpmBins;;"RPM",   @@RPM_1_BYTE_PACKING_MULT@@,     0,      0.0,   12000.0,   0 
@@ -1636,6 +1635,8 @@ end_struct
 #define ET_MRE_MIATA_NB2_MAF 15
 #define ET_MRE_OLD_TEST_BOARD 30
 #define ET_MRE_NEW_TEST_BOARD 31
+#define ET_MRE_DEFAULTS 60
+
 #define ET_FRANKENSO_MIATA_NA6 41
 #define ET_FRANKENSO_MIATA_NB2 47
 #define ET_FRANKENSO_MIATA_NA6_VAF 57
diff --git a/firmware/tunerstudio/cache/microrusefi/rusefi_config.txt b/firmware/tunerstudio/cache/microrusefi/rusefi_config.txt
index 18c6890c44..4494b49640 100644
--- a/firmware/tunerstudio/cache/microrusefi/rusefi_config.txt
+++ b/firmware/tunerstudio/cache/microrusefi/rusefi_config.txt
@@ -304,7 +304,7 @@ struct gppwm_channel
 	uint8_t offBelowDuty;+In on-off mode, turn the output off when the table value is below this duty.;"%", 1, 0, 0, 100, 0
 
 	gppwm_channel_e loadAxis;+Selects the load axis to use for the table.;
-	uint8_t[1] alignmentFill;
+	uint8_t alignmentFill_map;;"unit",      1,     0,    0, 100,     0
 
 	uint8_t[GPPWM_LOAD_COUNT] loadBins;;"load",      1,     0,   0.0,    250,   0
 	uint8_t[GPPWM_RPM_COUNT] rpmBins;;"RPM",  @@RPM_1_BYTE_PACKING_MULT@@,     0,      0.0,   12000.0,   0
@@ -324,7 +324,7 @@ float lowValue;kPa value at low volts;"kpa",      1,     0,    -400, 800,     2
 float highValue;kPa value at high volts;"kpa",      1,     0,    -400, 800,     2
 air_pressure_sensor_type_e type;
 adc_channel_e hwChannel;
-uint8_t[3] alignmentFill;
+uint8_t[3] alignmentFill;;"unit",      1,     0,    0, 100,     0
 
 end_struct
 
@@ -349,7 +349,7 @@ end_struct
 
 struct oil_pressure_config_s @brief Oil pressure sensor interpolation
 	adc_channel_e hwChannel;
-	uint8_t[3] alignmentFill;
+	uint8_t[3] alignmentFill;;"unit",      1,     0,    0, 100,     0
 	float v1;;         "volts",    1,    0.0,       0,    10.0,        2
 	float value1;;     "kPa",    1,      0.0,       0,  1000.0,        2
 	float v2;;         "volts",    1,    0.0,       0,    10.0,        2
@@ -557,7 +557,7 @@ float globalFuelCorrection;set global_fuel_correction X;"coef",    1,      0.0,
 	
 struct afr_sensor_s
 	adc_channel_e hwChannel;
-uint8_t[3] alignmentFill_afr;
+uint8_t[3] alignmentFill_afr;;"unit",      1,     0,    0, 100,     0
 	float v1;;         "volts",    1,    0.0,       0,    10.0,        2
 	float value1;;     "AFR",    1,      0.0,       0,  1000.0,        2
 	float v2;;         "volts",    1,    0.0,       0,    10.0,        2
@@ -1315,7 +1315,6 @@ float[AFTERSTART_HOLD_CURVE_SIZE] afterstartHoldTime;;"Seconds",        1,     0
 float[AFTERSTART_ENRICH_CURVE_SIZE] afterstartEnrich;;"%",              1,     0,      0,    600,   1
 float[AFTERSTART_DECAY_CURVE_SIZE] afterstartDecayTime;;"Seconds",      1,     0,      0,    100,   1
 
-
 boost_table_t boostTableOpenLoop;
 uint8_t[8] unused6312;;"units", 1, 0, -20, 100, 0
 uint8_t[BOOST_RPM_COUNT] boostRpmBins;;"RPM",   @@RPM_1_BYTE_PACKING_MULT@@,     0,      0.0,   12000.0,   0 
@@ -1636,6 +1635,8 @@ end_struct
 #define ET_MRE_MIATA_NB2_MAF 15
 #define ET_MRE_OLD_TEST_BOARD 30
 #define ET_MRE_NEW_TEST_BOARD 31
+#define ET_MRE_DEFAULTS 60
+
 #define ET_FRANKENSO_MIATA_NA6 41
 #define ET_FRANKENSO_MIATA_NB2 47
 #define ET_FRANKENSO_MIATA_NA6_VAF 57
diff --git a/firmware/tunerstudio/cache/prometheus/rusefi_config.txt b/firmware/tunerstudio/cache/prometheus/rusefi_config.txt
index 18c6890c44..4494b49640 100644
--- a/firmware/tunerstudio/cache/prometheus/rusefi_config.txt
+++ b/firmware/tunerstudio/cache/prometheus/rusefi_config.txt
@@ -304,7 +304,7 @@ struct gppwm_channel
 	uint8_t offBelowDuty;+In on-off mode, turn the output off when the table value is below this duty.;"%", 1, 0, 0, 100, 0
 
 	gppwm_channel_e loadAxis;+Selects the load axis to use for the table.;
-	uint8_t[1] alignmentFill;
+	uint8_t alignmentFill_map;;"unit",      1,     0,    0, 100,     0
 
 	uint8_t[GPPWM_LOAD_COUNT] loadBins;;"load",      1,     0,   0.0,    250,   0
 	uint8_t[GPPWM_RPM_COUNT] rpmBins;;"RPM",  @@RPM_1_BYTE_PACKING_MULT@@,     0,      0.0,   12000.0,   0
@@ -324,7 +324,7 @@ float lowValue;kPa value at low volts;"kpa",      1,     0,    -400, 800,     2
 float highValue;kPa value at high volts;"kpa",      1,     0,    -400, 800,     2
 air_pressure_sensor_type_e type;
 adc_channel_e hwChannel;
-uint8_t[3] alignmentFill;
+uint8_t[3] alignmentFill;;"unit",      1,     0,    0, 100,     0
 
 end_struct
 
@@ -349,7 +349,7 @@ end_struct
 
 struct oil_pressure_config_s @brief Oil pressure sensor interpolation
 	adc_channel_e hwChannel;
-	uint8_t[3] alignmentFill;
+	uint8_t[3] alignmentFill;;"unit",      1,     0,    0, 100,     0
 	float v1;;         "volts",    1,    0.0,       0,    10.0,        2
 	float value1;;     "kPa",    1,      0.0,       0,  1000.0,        2
 	float v2;;         "volts",    1,    0.0,       0,    10.0,        2
@@ -557,7 +557,7 @@ float globalFuelCorrection;set global_fuel_correction X;"coef",    1,      0.0,
 	
 struct afr_sensor_s
 	adc_channel_e hwChannel;
-uint8_t[3] alignmentFill_afr;
+uint8_t[3] alignmentFill_afr;;"unit",      1,     0,    0, 100,     0
 	float v1;;         "volts",    1,    0.0,       0,    10.0,        2
 	float value1;;     "AFR",    1,      0.0,       0,  1000.0,        2
 	float v2;;         "volts",    1,    0.0,       0,    10.0,        2
@@ -1315,7 +1315,6 @@ float[AFTERSTART_HOLD_CURVE_SIZE] afterstartHoldTime;;"Seconds",        1,     0
 float[AFTERSTART_ENRICH_CURVE_SIZE] afterstartEnrich;;"%",              1,     0,      0,    600,   1
 float[AFTERSTART_DECAY_CURVE_SIZE] afterstartDecayTime;;"Seconds",      1,     0,      0,    100,   1
 
-
 boost_table_t boostTableOpenLoop;
 uint8_t[8] unused6312;;"units", 1, 0, -20, 100, 0
 uint8_t[BOOST_RPM_COUNT] boostRpmBins;;"RPM",   @@RPM_1_BYTE_PACKING_MULT@@,     0,      0.0,   12000.0,   0 
@@ -1636,6 +1635,8 @@ end_struct
 #define ET_MRE_MIATA_NB2_MAF 15
 #define ET_MRE_OLD_TEST_BOARD 30
 #define ET_MRE_NEW_TEST_BOARD 31
+#define ET_MRE_DEFAULTS 60
+
 #define ET_FRANKENSO_MIATA_NA6 41
 #define ET_FRANKENSO_MIATA_NB2 47
 #define ET_FRANKENSO_MIATA_NA6_VAF 57
diff --git a/firmware/tunerstudio/cache/proteus/rusefi_config.txt b/firmware/tunerstudio/cache/proteus/rusefi_config.txt
index 18c6890c44..4494b49640 100644
--- a/firmware/tunerstudio/cache/proteus/rusefi_config.txt
+++ b/firmware/tunerstudio/cache/proteus/rusefi_config.txt
@@ -304,7 +304,7 @@ struct gppwm_channel
 	uint8_t offBelowDuty;+In on-off mode, turn the output off when the table value is below this duty.;"%", 1, 0, 0, 100, 0
 
 	gppwm_channel_e loadAxis;+Selects the load axis to use for the table.;
-	uint8_t[1] alignmentFill;
+	uint8_t alignmentFill_map;;"unit",      1,     0,    0, 100,     0
 
 	uint8_t[GPPWM_LOAD_COUNT] loadBins;;"load",      1,     0,   0.0,    250,   0
 	uint8_t[GPPWM_RPM_COUNT] rpmBins;;"RPM",  @@RPM_1_BYTE_PACKING_MULT@@,     0,      0.0,   12000.0,   0
@@ -324,7 +324,7 @@ float lowValue;kPa value at low volts;"kpa",      1,     0,    -400, 800,     2
 float highValue;kPa value at high volts;"kpa",      1,     0,    -400, 800,     2
 air_pressure_sensor_type_e type;
 adc_channel_e hwChannel;
-uint8_t[3] alignmentFill;
+uint8_t[3] alignmentFill;;"unit",      1,     0,    0, 100,     0
 
 end_struct
 
@@ -349,7 +349,7 @@ end_struct
 
 struct oil_pressure_config_s @brief Oil pressure sensor interpolation
 	adc_channel_e hwChannel;
-	uint8_t[3] alignmentFill;
+	uint8_t[3] alignmentFill;;"unit",      1,     0,    0, 100,     0
 	float v1;;         "volts",    1,    0.0,       0,    10.0,        2
 	float value1;;     "kPa",    1,      0.0,       0,  1000.0,        2
 	float v2;;         "volts",    1,    0.0,       0,    10.0,        2
@@ -557,7 +557,7 @@ float globalFuelCorrection;set global_fuel_correction X;"coef",    1,      0.0,
 	
 struct afr_sensor_s
 	adc_channel_e hwChannel;
-uint8_t[3] alignmentFill_afr;
+uint8_t[3] alignmentFill_afr;;"unit",      1,     0,    0, 100,     0
 	float v1;;         "volts",    1,    0.0,       0,    10.0,        2
 	float value1;;     "AFR",    1,      0.0,       0,  1000.0,        2
 	float v2;;         "volts",    1,    0.0,       0,    10.0,        2
@@ -1315,7 +1315,6 @@ float[AFTERSTART_HOLD_CURVE_SIZE] afterstartHoldTime;;"Seconds",        1,     0
 float[AFTERSTART_ENRICH_CURVE_SIZE] afterstartEnrich;;"%",              1,     0,      0,    600,   1
 float[AFTERSTART_DECAY_CURVE_SIZE] afterstartDecayTime;;"Seconds",      1,     0,      0,    100,   1
 
-
 boost_table_t boostTableOpenLoop;
 uint8_t[8] unused6312;;"units", 1, 0, -20, 100, 0
 uint8_t[BOOST_RPM_COUNT] boostRpmBins;;"RPM",   @@RPM_1_BYTE_PACKING_MULT@@,     0,      0.0,   12000.0,   0 
@@ -1636,6 +1635,8 @@ end_struct
 #define ET_MRE_MIATA_NB2_MAF 15
 #define ET_MRE_OLD_TEST_BOARD 30
 #define ET_MRE_NEW_TEST_BOARD 31
+#define ET_MRE_DEFAULTS 60
+
 #define ET_FRANKENSO_MIATA_NA6 41
 #define ET_FRANKENSO_MIATA_NB2 47
 #define ET_FRANKENSO_MIATA_NA6_VAF 57
diff --git a/firmware/tunerstudio/cache/rusefi_config.txt b/firmware/tunerstudio/cache/rusefi_config.txt
index 18c6890c44..4494b49640 100644
--- a/firmware/tunerstudio/cache/rusefi_config.txt
+++ b/firmware/tunerstudio/cache/rusefi_config.txt
@@ -304,7 +304,7 @@ struct gppwm_channel
 	uint8_t offBelowDuty;+In on-off mode, turn the output off when the table value is below this duty.;"%", 1, 0, 0, 100, 0
 
 	gppwm_channel_e loadAxis;+Selects the load axis to use for the table.;
-	uint8_t[1] alignmentFill;
+	uint8_t alignmentFill_map;;"unit",      1,     0,    0, 100,     0
 
 	uint8_t[GPPWM_LOAD_COUNT] loadBins;;"load",      1,     0,   0.0,    250,   0
 	uint8_t[GPPWM_RPM_COUNT] rpmBins;;"RPM",  @@RPM_1_BYTE_PACKING_MULT@@,     0,      0.0,   12000.0,   0
@@ -324,7 +324,7 @@ float lowValue;kPa value at low volts;"kpa",      1,     0,    -400, 800,     2
 float highValue;kPa value at high volts;"kpa",      1,     0,    -400, 800,     2
 air_pressure_sensor_type_e type;
 adc_channel_e hwChannel;
-uint8_t[3] alignmentFill;
+uint8_t[3] alignmentFill;;"unit",      1,     0,    0, 100,     0
 
 end_struct
 
@@ -349,7 +349,7 @@ end_struct
 
 struct oil_pressure_config_s @brief Oil pressure sensor interpolation
 	adc_channel_e hwChannel;
-	uint8_t[3] alignmentFill;
+	uint8_t[3] alignmentFill;;"unit",      1,     0,    0, 100,     0
 	float v1;;         "volts",    1,    0.0,       0,    10.0,        2
 	float value1;;     "kPa",    1,      0.0,       0,  1000.0,        2
 	float v2;;         "volts",    1,    0.0,       0,    10.0,        2
@@ -557,7 +557,7 @@ float globalFuelCorrection;set global_fuel_correction X;"coef",    1,      0.0,
 	
 struct afr_sensor_s
 	adc_channel_e hwChannel;
-uint8_t[3] alignmentFill_afr;
+uint8_t[3] alignmentFill_afr;;"unit",      1,     0,    0, 100,     0
 	float v1;;         "volts",    1,    0.0,       0,    10.0,        2
 	float value1;;     "AFR",    1,      0.0,       0,  1000.0,        2
 	float v2;;         "volts",    1,    0.0,       0,    10.0,        2
@@ -1315,7 +1315,6 @@ float[AFTERSTART_HOLD_CURVE_SIZE] afterstartHoldTime;;"Seconds",        1,     0
 float[AFTERSTART_ENRICH_CURVE_SIZE] afterstartEnrich;;"%",              1,     0,      0,    600,   1
 float[AFTERSTART_DECAY_CURVE_SIZE] afterstartDecayTime;;"Seconds",      1,     0,      0,    100,   1
 
-
 boost_table_t boostTableOpenLoop;
 uint8_t[8] unused6312;;"units", 1, 0, -20, 100, 0
 uint8_t[BOOST_RPM_COUNT] boostRpmBins;;"RPM",   @@RPM_1_BYTE_PACKING_MULT@@,     0,      0.0,   12000.0,   0 
@@ -1636,6 +1635,8 @@ end_struct
 #define ET_MRE_MIATA_NB2_MAF 15
 #define ET_MRE_OLD_TEST_BOARD 30
 #define ET_MRE_NEW_TEST_BOARD 31
+#define ET_MRE_DEFAULTS 60
+
 #define ET_FRANKENSO_MIATA_NA6 41
 #define ET_FRANKENSO_MIATA_NB2 47
 #define ET_FRANKENSO_MIATA_NA6_VAF 57
diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini
index cbbc37e118..ea5ecf8de6 100644
--- a/firmware/tunerstudio/rusefi.ini
+++ b/firmware/tunerstudio/rusefi.ini
@@ -46,12 +46,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
- 	signature    = "rusEFI 2020.06.30.all.309701893" 
+ 	signature    = "rusEFI 2020.07.01.all.129680412" 
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2020.06.30.all.309701893" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2020.07.01.all.129680412" ; signature is expected to be 7 or more characters.
 
 [Constants]
 ; new packet serial format with CRC
@@ -89,7 +89,7 @@ enable2ndByteCanID = false
 
 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 30 19:19:29 UTC 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 01 01:01:09 UTC 2020
 
 pageSize            = 20000
 page = 1
@@ -136,7 +136,7 @@ page = 1
 	tpsErrorDetectionTooHigh		= scalar, S16,	86,	"%", 1, 0, 100, 110, 0
 	cranking_baseFuel				= scalar, F32,	88,	"ms", 1, 0, 0, 200, 1
 	cranking_rpm					= scalar, S16,	92,	"RPM", 1, 0, 0, 3000, 0
-;no TS info - skipping cranking_alignmentFill_at_6 offset 94
+	cranking_alignmentFill_at_6		= array, U08,	94,	[2],	"units", 1, 0, -20, 100, 0
 	primingSquirtDurationMs			= scalar, F32,	96,	"*C", 1, 0, -40, 200, 1
 	ignitionDwellForCrankingMs		= scalar, F32,	100,	"ms", 1, 0, 0, 200, 1
 	crankingChargeAngle				= scalar, F32,	104,	"deg", 1, 0, 0, 3000.0, 0
@@ -148,7 +148,7 @@ page = 1
 	map_sensor_highValue			= scalar, F32,	240,	"kpa", 1, 0, -400, 800, 2
 	map_sensor_type				 = bits, U32, 244, [0:3] "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "type12", "type13", "INVALID", "INVALID"
 	map_sensor_hwChannel		 = bits, U08, 248, [0:4] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "Disabled", "PB12", "PB13", "PC14", "PC15", "PC16", "PC17", "PD3", "PD4", "PE2", "PE6", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-;no TS info - skipping map_sensor_alignmentFill offset 249
+	map_sensor_alignmentFill		= array, U08,	249,	[3],	"unit", 1, 0, 0, 100, 0
 	clt_tempC_1						= scalar, F32,	252,	"*C", 1, 0, -40, 200, 1
 	clt_tempC_2						= scalar, F32,	256,	"*C", 1, 0, -40, 200, 1
 	clt_tempC_3						= scalar, F32,	260,	"*C", 1, 0, -40, 200, 1
@@ -157,7 +157,7 @@ page = 1
 	clt_resistance_3				= scalar, F32,	272,	"Ohm", 1, 0, 0, 200000, 1
 	clt_bias_resistor				= scalar, F32,	276,	"Ohm", 1, 0, 0, 200000, 1
 	clt_adcChannel				 = bits, U08, 280, [0:4] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "Disabled", "PB12", "PB13", "PC14", "PC15", "PC16", "PC17", "PD3", "PD4", "PE2", "PE6", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-;no TS info - skipping clt_alignmentFill_at_29 offset 281
+	clt_alignmentFill_at_29			= array, U08,	281,	[3],	"units", 1, 0, -20, 100, 0
 	iat_tempC_1						= scalar, F32,	284,	"*C", 1, 0, -40, 200, 1
 	iat_tempC_2						= scalar, F32,	288,	"*C", 1, 0, -40, 200, 1
 	iat_tempC_3						= scalar, F32,	292,	"*C", 1, 0, -40, 200, 1
@@ -166,7 +166,7 @@ page = 1
 	iat_resistance_3				= scalar, F32,	304,	"Ohm", 1, 0, 0, 200000, 1
 	iat_bias_resistor				= scalar, F32,	308,	"Ohm", 1, 0, 0, 200000, 1
 	iat_adcChannel				 = bits, U08, 312, [0:4] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "Disabled", "PB12", "PB13", "PC14", "PC15", "PC16", "PC17", "PD3", "PD4", "PE2", "PE6", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-;no TS info - skipping iat_alignmentFill_at_29 offset 313
+	iat_alignmentFill_at_29			= array, U08,	313,	[3],	"units", 1, 0, -20, 100, 0
 	launchRpm						= scalar, S32,	316,	"rpm", 1, 0, 0, 20000.0, 2
 	launchTimingRetard				= scalar, S32,	320,	"deg", 1, 0, -180, 180, 2
 	hip9011PrescalerAndSDO			= scalar, S32,	324,	"integer", 1, 0.0, 0.0, 32, 0
@@ -255,7 +255,7 @@ page = 1
 	camInputs3					 = bits, U08, 558, [0:7], "NONE", "INVALID", "INVALID", "PA1", "PA2", "PA3", "INVALID", "PA5", "PA6", "PA7", "PA8", "PA9", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA15", "INVALID", "INVALID", "INVALID", "PB3", "PB4", "PB5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "PC7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PE5", "PE6", "INVALID", "INVALID", "PE9", "INVALID", "PE11", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 	camInputs4					 = bits, U08, 559, [0:7], "NONE", "INVALID", "INVALID", "PA1", "PA2", "PA3", "INVALID", "PA5", "PA6", "PA7", "PA8", "PA9", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA15", "INVALID", "INVALID", "INVALID", "PB3", "PB4", "PB5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "PC7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PE5", "PE6", "INVALID", "INVALID", "PE9", "INVALID", "PE11", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 	afr_hwChannel				 = bits, U08, 560, [0:4] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "Disabled", "PB12", "PB13", "PC14", "PC15", "PC16", "PC17", "PD3", "PD4", "PE2", "PE6", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-;no TS info - skipping afr_alignmentFill_afr offset 561
+	afr_alignmentFill_afr			= array, U08,	561,	[3],	"unit", 1, 0, 0, 100, 0
 	afr_v1							= scalar, F32,	564,	 "volts", 1, 0.0, 0, 10.0, 2
 	afr_value1						= scalar, F32,	568,	 "AFR", 1, 0.0, 0, 1000.0, 2
 	afr_v2							= scalar, F32,	572,	 "volts", 1, 0.0, 0, 10.0, 2
@@ -268,7 +268,7 @@ page = 1
 	baroSensor_highValue			= scalar, F32,	588,	"kpa", 1, 0, -400, 800, 2
 	baroSensor_type				 = bits, U32, 592, [0:3] "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "type12", "type13", "INVALID", "INVALID"
 	baroSensor_hwChannel		 = bits, U08, 596, [0:4] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "Disabled", "PB12", "PB13", "PC14", "PC15", "PC16", "PC17", "PD3", "PD4", "PE2", "PE6", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-;no TS info - skipping baroSensor_alignmentFill offset 597
+	baroSensor_alignmentFill		= array, U08,	597,	[3],	"unit", 1, 0, 0, 100, 0
 	idle_solenoidFrequency			= scalar, S32,	600,	"Hz", 1, 0, 0, 3000, 0
 	idle_solenoidPin			 = bits, U08, 604, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16", "MC33972_1", "MC33972_2", "MC33972_3", "MC33972_4", "MC33972_5", "MC33972_6", "MC33972_7", "MC33972_8", "MC33972_9", "MC33972_10", "MC33972_11", "MC33972_12", "MC33972_13", "MC33972_14", "MC33972_15", "MC33972_16", "MC33972_17", "MC33972_18", "MC33972_19", "MC33972_20", "MC33972_21", "MC33972_22", "TLE8888_1", "TLE8888_2", "TLE8888_3", "TLE8888_4", "TLE8888_5", "TLE8888_6", "TLE8888_7", "TLE8888_8", "TLE8888_9", "TLE8888_10", "TLE8888_11", "TLE8888_12", "TLE8888_13", "TLE8888_14", "TLE8888_15", "TLE8888_16", "TLE8888_17", "TLE8888_18", "TLE8888_19", "TLE8888_20", "TLE8888_21", "TLE8888_22", "TLE8888_23", "TLE8888_24", "TLE8888_25", "TLE8888_26", "TLE8888_27", "TLE8888_28", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 	idle_stepperDirectionPin	 = bits, U08, 605, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@@ -833,7 +833,7 @@ page = 1
 	throttlePedalSecondaryUpVoltage		= scalar, F32,	2100,	"voltage", 1, 0, -6, 6, 2
 	throttlePedalSecondaryWOTVoltage		= scalar, F32,	2104,	"voltage", 1, 0, -6, 6, 2
 	canBaudRate					 = bits, U08, 2108, [0:1], "100kbps", "250kbps" , "500kbps", "1Mbps"
-;no TS info - skipping alignmentFill_at_2109 offset 2109
+	alignmentFill_at_2109			= array, U08,	2109,	[3],	"units", 1, 0, -20, 100, 0
 	unused_former_warmup_target_afr		= array, U32,	2112,	[5],	"units", 1, 0, -20, 100, 0
 	boostCutPressure				= scalar, F32,	2132,	"kPa", 1, 0, 0, 500, 0
 	mapAccelTaperBins				= array, F32,	2136,	[8],	"counter", 1, 0, 0.0, 300, 0
@@ -887,7 +887,7 @@ page = 1
 	auxTempSensor1_resistance_3		= scalar, F32,	2464,	"Ohm", 1, 0, 0, 200000, 1
 	auxTempSensor1_bias_resistor		= scalar, F32,	2468,	"Ohm", 1, 0, 0, 200000, 1
 	auxTempSensor1_adcChannel	 = bits, U08, 2472, [0:4] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "Disabled", "PB12", "PB13", "PC14", "PC15", "PC16", "PC17", "PD3", "PD4", "PE2", "PE6", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-;no TS info - skipping auxTempSensor1_alignmentFill_at_29 offset 2473
+	auxTempSensor1_alignmentFill_at_29		= array, U08,	2473,	[3],	"units", 1, 0, -20, 100, 0
 	auxTempSensor2_tempC_1			= scalar, F32,	2476,	"*C", 1, 0, -40, 200, 1
 	auxTempSensor2_tempC_2			= scalar, F32,	2480,	"*C", 1, 0, -40, 200, 1
 	auxTempSensor2_tempC_3			= scalar, F32,	2484,	"*C", 1, 0, -40, 200, 1
@@ -896,7 +896,7 @@ page = 1
 	auxTempSensor2_resistance_3		= scalar, F32,	2496,	"Ohm", 1, 0, 0, 200000, 1
 	auxTempSensor2_bias_resistor		= scalar, F32,	2500,	"Ohm", 1, 0, 0, 200000, 1
 	auxTempSensor2_adcChannel	 = bits, U08, 2504, [0:4] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "Disabled", "PB12", "PB13", "PC14", "PC15", "PC16", "PC17", "PD3", "PD4", "PE2", "PE6", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-;no TS info - skipping auxTempSensor2_alignmentFill_at_29 offset 2505
+	auxTempSensor2_alignmentFill_at_29		= array, U08,	2505,	[3],	"units", 1, 0, -20, 100, 0
 	unused2508						= array, U08,	2508,	[6],	"units", 1, 0, -20, 100, 0
 	etbFreq							= scalar, S16,	2514,	"Hz", 1, 0, 0, 30000, 0
 	unused2516						= array, U08,	2516,	[24],	"units", 1, 0, -20, 100, 0
@@ -960,7 +960,7 @@ page = 1
 	auxPid4_minValue				= scalar, S16,	2688,	"", 1, 0, -30000, 30000.0, 0
 	auxPid4_maxValue				= scalar, S16,	2690,	"", 1, 0, -30000, 30000.0, 0
 	oilPressure_hwChannel		 = bits, U08, 2692, [0:4] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "Disabled", "PB12", "PB13", "PC14", "PC15", "PC16", "PC17", "PD3", "PD4", "PE2", "PE6", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-;no TS info - skipping oilPressure_alignmentFill offset 2693
+	oilPressure_alignmentFill		= array, U08,	2693,	[3],	"unit", 1, 0, 0, 100, 0
 	oilPressure_v1					= scalar, F32,	2696,	 "volts", 1, 0.0, 0, 10.0, 2
 	oilPressure_value1				= scalar, F32,	2700,	 "kPa", 1, 0.0, 0, 1000.0, 2
 	oilPressure_v2					= scalar, F32,	2704,	 "volts", 1, 0.0, 0, 10.0, 2
@@ -1063,7 +1063,7 @@ page = 1
 	gppwm1_onAboveDuty				= scalar, U08,	4148,	"%", 1, 0, 0, 100, 0
 	gppwm1_offBelowDuty				= scalar, U08,	4149,	"%", 1, 0, 0, 100, 0
 	gppwm1_loadAxis				 = bits, U08, 4150, [0:1], "TPS", "MAP", "CLT", "IAT"
-;no TS info - skipping gppwm1_alignmentFill offset 4151
+	gppwm1_alignmentFill_map		= scalar, U08,	4151,	"unit", 1, 0, 0, 100, 0
 	gppwm1_loadBins					= array, U08,	4152,	[8],	"load", 1, 0, 0.0, 250, 0
 	gppwm1_rpmBins					= array, U08,	4160,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
 	gppwm1_table				 = array, U08, 4168, [8x8], "duty", 1, 0, 0, 100, 0
@@ -1073,7 +1073,7 @@ page = 1
 	gppwm2_onAboveDuty				= scalar, U08,	4236,	"%", 1, 0, 0, 100, 0
 	gppwm2_offBelowDuty				= scalar, U08,	4237,	"%", 1, 0, 0, 100, 0
 	gppwm2_loadAxis				 = bits, U08, 4238, [0:1], "TPS", "MAP", "CLT", "IAT"
-;no TS info - skipping gppwm2_alignmentFill offset 4239
+	gppwm2_alignmentFill_map		= scalar, U08,	4239,	"unit", 1, 0, 0, 100, 0
 	gppwm2_loadBins					= array, U08,	4240,	[8],	"load", 1, 0, 0.0, 250, 0
 	gppwm2_rpmBins					= array, U08,	4248,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
 	gppwm2_table				 = array, U08, 4256, [8x8], "duty", 1, 0, 0, 100, 0
@@ -1083,7 +1083,7 @@ page = 1
 	gppwm3_onAboveDuty				= scalar, U08,	4324,	"%", 1, 0, 0, 100, 0
 	gppwm3_offBelowDuty				= scalar, U08,	4325,	"%", 1, 0, 0, 100, 0
 	gppwm3_loadAxis				 = bits, U08, 4326, [0:1], "TPS", "MAP", "CLT", "IAT"
-;no TS info - skipping gppwm3_alignmentFill offset 4327
+	gppwm3_alignmentFill_map		= scalar, U08,	4327,	"unit", 1, 0, 0, 100, 0
 	gppwm3_loadBins					= array, U08,	4328,	[8],	"load", 1, 0, 0.0, 250, 0
 	gppwm3_rpmBins					= array, U08,	4336,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
 	gppwm3_table				 = array, U08, 4344, [8x8], "duty", 1, 0, 0, 100, 0
@@ -1093,7 +1093,7 @@ page = 1
 	gppwm4_onAboveDuty				= scalar, U08,	4412,	"%", 1, 0, 0, 100, 0
 	gppwm4_offBelowDuty				= scalar, U08,	4413,	"%", 1, 0, 0, 100, 0
 	gppwm4_loadAxis				 = bits, U08, 4414, [0:1], "TPS", "MAP", "CLT", "IAT"
-;no TS info - skipping gppwm4_alignmentFill offset 4415
+	gppwm4_alignmentFill_map		= scalar, U08,	4415,	"unit", 1, 0, 0, 100, 0
 	gppwm4_loadBins					= array, U08,	4416,	[8],	"load", 1, 0, 0.0, 250, 0
 	gppwm4_rpmBins					= array, U08,	4424,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
 	gppwm4_table				 = array, U08, 4432, [8x8], "duty", 1, 0, 0, 100, 0
@@ -1106,7 +1106,7 @@ page = 1
 	mc33_t_bypass					= scalar, U16,	4508,	"X", 1, 0.0, 0, 64000, 0
 	mc33_t_hold_off					= scalar, U16,	4510,	"X", 1, 0.0, 0, 64000, 0
 	mc33_t_hold_tot					= scalar, U16,	4512,	"X", 1, 0.0, 0, 64000, 0
-;no TS info - skipping alignmentFill_at_4514 offset 4514
+	alignmentFill_at_4514			= array, U08,	4514,	[2],	"units", 1, 0, -20, 100, 0
 	mainUnusedEnd					= array, S32,	4516,	[371],	"units", 1, 0, -20, 100, 0
 	warning_message				 = string, ASCII, 6000, 120
 	afterstartCoolantBins			= array, F32,	6120,	[8],	"C", 1, 0, -100.0, 250.0, 0
diff --git a/firmware/tunerstudio/rusefi_frankenso.ini b/firmware/tunerstudio/rusefi_frankenso.ini
index a6faba25dc..fd7db14630 100644
--- a/firmware/tunerstudio/rusefi_frankenso.ini
+++ b/firmware/tunerstudio/rusefi_frankenso.ini
@@ -46,12 +46,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
- 	signature    = "rusEFI 2020.06.30.fra.675902380" 
+ 	signature    = "rusEFI 2020.07.01.fra.234216687" 
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2020.06.30.fra.675902380" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2020.07.01.fra.234216687" ; signature is expected to be 7 or more characters.
 
 [Constants]
 ; new packet serial format with CRC
@@ -89,7 +89,7 @@ enable2ndByteCanID = false
 
 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 30 19:19:33 UTC 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 01 01:01:12 UTC 2020
 
 pageSize            = 20000
 page = 1
@@ -136,7 +136,7 @@ page = 1
 	tpsErrorDetectionTooHigh		= scalar, S16,	86,	"%", 1, 0, 100, 110, 0
 	cranking_baseFuel				= scalar, F32,	88,	"ms", 1, 0, 0, 200, 1
 	cranking_rpm					= scalar, S16,	92,	"RPM", 1, 0, 0, 3000, 0
-;no TS info - skipping cranking_alignmentFill_at_6 offset 94
+	cranking_alignmentFill_at_6		= array, U08,	94,	[2],	"units", 1, 0, -20, 100, 0
 	primingSquirtDurationMs			= scalar, F32,	96,	"*C", 1, 0, -40, 200, 1
 	ignitionDwellForCrankingMs		= scalar, F32,	100,	"ms", 1, 0, 0, 200, 1
 	crankingChargeAngle				= scalar, F32,	104,	"deg", 1, 0, 0, 3000.0, 0
@@ -148,7 +148,7 @@ page = 1
 	map_sensor_highValue			= scalar, F32,	240,	"kpa", 1, 0, -400, 800, 2
 	map_sensor_type				 = bits, U32, 244, [0:3] "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "type12", "type13", "INVALID", "INVALID"
 	map_sensor_hwChannel		 = bits, U08, 248, [0:4] "Analog 3O","Analog 3L","Analog 3M","Analog 3J","Analog 3I","INVALID","Analog 3H","Analog 3G","INVALID","INVALID","INVALID","Analog 3P","Analog 3Q","Analog 3N","Analog VBatt","Analog 3E","NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-;no TS info - skipping map_sensor_alignmentFill offset 249
+	map_sensor_alignmentFill		= array, U08,	249,	[3],	"unit", 1, 0, 0, 100, 0
 	clt_tempC_1						= scalar, F32,	252,	"*C", 1, 0, -40, 200, 1
 	clt_tempC_2						= scalar, F32,	256,	"*C", 1, 0, -40, 200, 1
 	clt_tempC_3						= scalar, F32,	260,	"*C", 1, 0, -40, 200, 1
@@ -157,7 +157,7 @@ page = 1
 	clt_resistance_3				= scalar, F32,	272,	"Ohm", 1, 0, 0, 200000, 1
 	clt_bias_resistor				= scalar, F32,	276,	"Ohm", 1, 0, 0, 200000, 1
 	clt_adcChannel				 = bits, U08, 280, [0:4] "Analog 3O","Analog 3L","Analog 3M","Analog 3J","Analog 3I","INVALID","Analog 3H","Analog 3G","INVALID","INVALID","INVALID","Analog 3P","Analog 3Q","Analog 3N","Analog VBatt","Analog 3E","NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-;no TS info - skipping clt_alignmentFill_at_29 offset 281
+	clt_alignmentFill_at_29			= array, U08,	281,	[3],	"units", 1, 0, -20, 100, 0
 	iat_tempC_1						= scalar, F32,	284,	"*C", 1, 0, -40, 200, 1
 	iat_tempC_2						= scalar, F32,	288,	"*C", 1, 0, -40, 200, 1
 	iat_tempC_3						= scalar, F32,	292,	"*C", 1, 0, -40, 200, 1
@@ -166,7 +166,7 @@ page = 1
 	iat_resistance_3				= scalar, F32,	304,	"Ohm", 1, 0, 0, 200000, 1
 	iat_bias_resistor				= scalar, F32,	308,	"Ohm", 1, 0, 0, 200000, 1
 	iat_adcChannel				 = bits, U08, 312, [0:4] "Analog 3O","Analog 3L","Analog 3M","Analog 3J","Analog 3I","INVALID","Analog 3H","Analog 3G","INVALID","INVALID","INVALID","Analog 3P","Analog 3Q","Analog 3N","Analog VBatt","Analog 3E","NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-;no TS info - skipping iat_alignmentFill_at_29 offset 313
+	iat_alignmentFill_at_29			= array, U08,	313,	[3],	"units", 1, 0, -20, 100, 0
 	launchRpm						= scalar, S32,	316,	"rpm", 1, 0, 0, 20000.0, 2
 	launchTimingRetard				= scalar, S32,	320,	"deg", 1, 0, -180, 180, 2
 	hip9011PrescalerAndSDO			= scalar, S32,	324,	"integer", 1, 0.0, 0.0, 32, 0
@@ -255,7 +255,7 @@ page = 1
 	camInputs3					 = bits, U08, 558, [0:7], "NONE", "INVALID", "INVALID", "PA1", "PA2", "PA3", "INVALID", "PA5", "PA6", "PA7", "PA8", "PA9", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA15", "INVALID", "INVALID", "INVALID", "PB3", "PB4", "PB5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "PC7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PE5", "PE6", "INVALID", "INVALID", "PE9", "INVALID", "PE11", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 	camInputs4					 = bits, U08, 559, [0:7], "NONE", "INVALID", "INVALID", "PA1", "PA2", "PA3", "INVALID", "PA5", "PA6", "PA7", "PA8", "PA9", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA15", "INVALID", "INVALID", "INVALID", "PB3", "PB4", "PB5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "PC7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PE5", "PE6", "INVALID", "INVALID", "PE9", "INVALID", "PE11", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 	afr_hwChannel				 = bits, U08, 560, [0:4] "Analog 3O","Analog 3L","Analog 3M","Analog 3J","Analog 3I","INVALID","Analog 3H","Analog 3G","INVALID","INVALID","INVALID","Analog 3P","Analog 3Q","Analog 3N","Analog VBatt","Analog 3E","NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-;no TS info - skipping afr_alignmentFill_afr offset 561
+	afr_alignmentFill_afr			= array, U08,	561,	[3],	"unit", 1, 0, 0, 100, 0
 	afr_v1							= scalar, F32,	564,	 "volts", 1, 0.0, 0, 10.0, 2
 	afr_value1						= scalar, F32,	568,	 "AFR", 1, 0.0, 0, 1000.0, 2
 	afr_v2							= scalar, F32,	572,	 "volts", 1, 0.0, 0, 10.0, 2
@@ -268,7 +268,7 @@ page = 1
 	baroSensor_highValue			= scalar, F32,	588,	"kpa", 1, 0, -400, 800, 2
 	baroSensor_type				 = bits, U32, 592, [0:3] "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "type12", "type13", "INVALID", "INVALID"
 	baroSensor_hwChannel		 = bits, U08, 596, [0:4] "Analog 3O","Analog 3L","Analog 3M","Analog 3J","Analog 3I","INVALID","Analog 3H","Analog 3G","INVALID","INVALID","INVALID","Analog 3P","Analog 3Q","Analog 3N","Analog VBatt","Analog 3E","NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-;no TS info - skipping baroSensor_alignmentFill offset 597
+	baroSensor_alignmentFill		= array, U08,	597,	[3],	"unit", 1, 0, 0, 100, 0
 	idle_solenoidFrequency			= scalar, S32,	600,	"Hz", 1, 0, 0, 3000, 0
 	idle_solenoidPin			 = bits, U08, 604, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Injector 3Z","Injector 3Y","Injector 3W","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Coil 1H","INVALID","Coil 1F","INVALID","INVALID","INVALID","Injector 2M","INVALID","INVALID","INVALID","INVALID","INVALID","Injector 3U","INVALID","Injector 3X","INVALID","Injector 2N","Coil 1O","Coil 1P","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Injector 3V","Injector 3S","Injector 3T","Injector 2O","Injector 2P","INVALID","Coil 1L","INVALID","Coil 1I","INVALID","Coil 1M","INVALID","Coil 1G","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 	idle_stepperDirectionPin	 = bits, U08, 605, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@@ -833,7 +833,7 @@ page = 1
 	throttlePedalSecondaryUpVoltage		= scalar, F32,	2100,	"voltage", 1, 0, -6, 6, 2
 	throttlePedalSecondaryWOTVoltage		= scalar, F32,	2104,	"voltage", 1, 0, -6, 6, 2
 	canBaudRate					 = bits, U08, 2108, [0:1], "100kbps", "250kbps" , "500kbps", "1Mbps"
-;no TS info - skipping alignmentFill_at_2109 offset 2109
+	alignmentFill_at_2109			= array, U08,	2109,	[3],	"units", 1, 0, -20, 100, 0
 	unused_former_warmup_target_afr		= array, U32,	2112,	[5],	"units", 1, 0, -20, 100, 0
 	boostCutPressure				= scalar, F32,	2132,	"kPa", 1, 0, 0, 500, 0
 	mapAccelTaperBins				= array, F32,	2136,	[8],	"counter", 1, 0, 0.0, 300, 0
@@ -887,7 +887,7 @@ page = 1
 	auxTempSensor1_resistance_3		= scalar, F32,	2464,	"Ohm", 1, 0, 0, 200000, 1
 	auxTempSensor1_bias_resistor		= scalar, F32,	2468,	"Ohm", 1, 0, 0, 200000, 1
 	auxTempSensor1_adcChannel	 = bits, U08, 2472, [0:4] "Analog 3O","Analog 3L","Analog 3M","Analog 3J","Analog 3I","INVALID","Analog 3H","Analog 3G","INVALID","INVALID","INVALID","Analog 3P","Analog 3Q","Analog 3N","Analog VBatt","Analog 3E","NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-;no TS info - skipping auxTempSensor1_alignmentFill_at_29 offset 2473
+	auxTempSensor1_alignmentFill_at_29		= array, U08,	2473,	[3],	"units", 1, 0, -20, 100, 0
 	auxTempSensor2_tempC_1			= scalar, F32,	2476,	"*C", 1, 0, -40, 200, 1
 	auxTempSensor2_tempC_2			= scalar, F32,	2480,	"*C", 1, 0, -40, 200, 1
 	auxTempSensor2_tempC_3			= scalar, F32,	2484,	"*C", 1, 0, -40, 200, 1
@@ -896,7 +896,7 @@ page = 1
 	auxTempSensor2_resistance_3		= scalar, F32,	2496,	"Ohm", 1, 0, 0, 200000, 1
 	auxTempSensor2_bias_resistor		= scalar, F32,	2500,	"Ohm", 1, 0, 0, 200000, 1
 	auxTempSensor2_adcChannel	 = bits, U08, 2504, [0:4] "Analog 3O","Analog 3L","Analog 3M","Analog 3J","Analog 3I","INVALID","Analog 3H","Analog 3G","INVALID","INVALID","INVALID","Analog 3P","Analog 3Q","Analog 3N","Analog VBatt","Analog 3E","NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-;no TS info - skipping auxTempSensor2_alignmentFill_at_29 offset 2505
+	auxTempSensor2_alignmentFill_at_29		= array, U08,	2505,	[3],	"units", 1, 0, -20, 100, 0
 	unused2508						= array, U08,	2508,	[6],	"units", 1, 0, -20, 100, 0
 	etbFreq							= scalar, S16,	2514,	"Hz", 1, 0, 0, 30000, 0
 	unused2516						= array, U08,	2516,	[24],	"units", 1, 0, -20, 100, 0
@@ -960,7 +960,7 @@ page = 1
 	auxPid4_minValue				= scalar, S16,	2688,	"", 1, 0, -30000, 30000.0, 0
 	auxPid4_maxValue				= scalar, S16,	2690,	"", 1, 0, -30000, 30000.0, 0
 	oilPressure_hwChannel		 = bits, U08, 2692, [0:4] "Analog 3O","Analog 3L","Analog 3M","Analog 3J","Analog 3I","INVALID","Analog 3H","Analog 3G","INVALID","INVALID","INVALID","Analog 3P","Analog 3Q","Analog 3N","Analog VBatt","Analog 3E","NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-;no TS info - skipping oilPressure_alignmentFill offset 2693
+	oilPressure_alignmentFill		= array, U08,	2693,	[3],	"unit", 1, 0, 0, 100, 0
 	oilPressure_v1					= scalar, F32,	2696,	 "volts", 1, 0.0, 0, 10.0, 2
 	oilPressure_value1				= scalar, F32,	2700,	 "kPa", 1, 0.0, 0, 1000.0, 2
 	oilPressure_v2					= scalar, F32,	2704,	 "volts", 1, 0.0, 0, 10.0, 2
@@ -1063,7 +1063,7 @@ page = 1
 	gppwm1_onAboveDuty				= scalar, U08,	4148,	"%", 1, 0, 0, 100, 0
 	gppwm1_offBelowDuty				= scalar, U08,	4149,	"%", 1, 0, 0, 100, 0
 	gppwm1_loadAxis				 = bits, U08, 4150, [0:1], "TPS", "MAP", "CLT", "IAT"
-;no TS info - skipping gppwm1_alignmentFill offset 4151
+	gppwm1_alignmentFill_map		= scalar, U08,	4151,	"unit", 1, 0, 0, 100, 0
 	gppwm1_loadBins					= array, U08,	4152,	[8],	"load", 1, 0, 0.0, 250, 0
 	gppwm1_rpmBins					= array, U08,	4160,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
 	gppwm1_table				 = array, U08, 4168, [8x8], "duty", 1, 0, 0, 100, 0
@@ -1073,7 +1073,7 @@ page = 1
 	gppwm2_onAboveDuty				= scalar, U08,	4236,	"%", 1, 0, 0, 100, 0
 	gppwm2_offBelowDuty				= scalar, U08,	4237,	"%", 1, 0, 0, 100, 0
 	gppwm2_loadAxis				 = bits, U08, 4238, [0:1], "TPS", "MAP", "CLT", "IAT"
-;no TS info - skipping gppwm2_alignmentFill offset 4239
+	gppwm2_alignmentFill_map		= scalar, U08,	4239,	"unit", 1, 0, 0, 100, 0
 	gppwm2_loadBins					= array, U08,	4240,	[8],	"load", 1, 0, 0.0, 250, 0
 	gppwm2_rpmBins					= array, U08,	4248,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
 	gppwm2_table				 = array, U08, 4256, [8x8], "duty", 1, 0, 0, 100, 0
@@ -1083,7 +1083,7 @@ page = 1
 	gppwm3_onAboveDuty				= scalar, U08,	4324,	"%", 1, 0, 0, 100, 0
 	gppwm3_offBelowDuty				= scalar, U08,	4325,	"%", 1, 0, 0, 100, 0
 	gppwm3_loadAxis				 = bits, U08, 4326, [0:1], "TPS", "MAP", "CLT", "IAT"
-;no TS info - skipping gppwm3_alignmentFill offset 4327
+	gppwm3_alignmentFill_map		= scalar, U08,	4327,	"unit", 1, 0, 0, 100, 0
 	gppwm3_loadBins					= array, U08,	4328,	[8],	"load", 1, 0, 0.0, 250, 0
 	gppwm3_rpmBins					= array, U08,	4336,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
 	gppwm3_table				 = array, U08, 4344, [8x8], "duty", 1, 0, 0, 100, 0
@@ -1093,7 +1093,7 @@ page = 1
 	gppwm4_onAboveDuty				= scalar, U08,	4412,	"%", 1, 0, 0, 100, 0
 	gppwm4_offBelowDuty				= scalar, U08,	4413,	"%", 1, 0, 0, 100, 0
 	gppwm4_loadAxis				 = bits, U08, 4414, [0:1], "TPS", "MAP", "CLT", "IAT"
-;no TS info - skipping gppwm4_alignmentFill offset 4415
+	gppwm4_alignmentFill_map		= scalar, U08,	4415,	"unit", 1, 0, 0, 100, 0
 	gppwm4_loadBins					= array, U08,	4416,	[8],	"load", 1, 0, 0.0, 250, 0
 	gppwm4_rpmBins					= array, U08,	4424,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
 	gppwm4_table				 = array, U08, 4432, [8x8], "duty", 1, 0, 0, 100, 0
@@ -1106,7 +1106,7 @@ page = 1
 	mc33_t_bypass					= scalar, U16,	4508,	"X", 1, 0.0, 0, 64000, 0
 	mc33_t_hold_off					= scalar, U16,	4510,	"X", 1, 0.0, 0, 64000, 0
 	mc33_t_hold_tot					= scalar, U16,	4512,	"X", 1, 0.0, 0, 64000, 0
-;no TS info - skipping alignmentFill_at_4514 offset 4514
+	alignmentFill_at_4514			= array, U08,	4514,	[2],	"units", 1, 0, -20, 100, 0
 	mainUnusedEnd					= array, S32,	4516,	[371],	"units", 1, 0, -20, 100, 0
 	warning_message				 = string, ASCII, 6000, 120
 	afterstartCoolantBins			= array, F32,	6120,	[8],	"C", 1, 0, -100.0, 250.0, 0
diff --git a/firmware/tunerstudio/rusefi_kinetis.ini b/firmware/tunerstudio/rusefi_kinetis.ini
index c2f0944a86..2bf90ecd24 100644
--- a/firmware/tunerstudio/rusefi_kinetis.ini
+++ b/firmware/tunerstudio/rusefi_kinetis.ini
@@ -46,12 +46,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
- 	signature    = "rusEFI 2020.06.30.kin.831009872" 
+ 	signature    = "rusEFI 2020.07.01.kin.82634164" 
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2020.06.30.kin.831009872" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2020.07.01.kin.82634164" ; signature is expected to be 7 or more characters.
 
 [Constants]
 ; new packet serial format with CRC
@@ -89,7 +89,7 @@ enable2ndByteCanID = false
 
 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Jun 30 19:19:37 UTC 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Jul 01 01:01:17 UTC 2020
 
 pageSize            = 20000
 page = 1
@@ -136,7 +136,7 @@ page = 1
 	tpsErrorDetectionTooHigh		= scalar, S16,	86,	"%", 1, 0, 100, 110, 0
 	cranking_baseFuel				= scalar, F32,	88,	"ms", 1, 0, 0, 200, 1
 	cranking_rpm					= scalar, S16,	92,	"RPM", 1, 0, 0, 3000, 0
-;no TS info - skipping cranking_alignmentFill_at_6 offset 94
+	cranking_alignmentFill_at_6		= array, U08,	94,	[2],	"units", 1, 0, -20, 100, 0
 	primingSquirtDurationMs			= scalar, F32,	96,	"*C", 1, 0, -40, 200, 1
 	ignitionDwellForCrankingMs		= scalar, F32,	100,	"ms", 1, 0, 0, 200, 1
 	crankingChargeAngle				= scalar, F32,	104,	"deg", 1, 0, 0, 3000.0, 0
@@ -148,7 +148,7 @@ page = 1
 	map_sensor_highValue			= scalar, F32,	240,	"kpa", 1, 0, -400, 800, 2
 	map_sensor_type				 = bits, U32, 244, [0:3] "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "type12", "type13", "INVALID", "INVALID"
 	map_sensor_hwChannel		 = bits, U08, 248, [0:4] "PA2", "PA3", "INVALID", "PD3", "INVALID", "INVALID", "INVALID", "PB12", "PB13", "INVALID", "PE2", "INVALID", "PC14", "PC15", "PC16", "PC17", "Disabled", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-;no TS info - skipping map_sensor_alignmentFill offset 249
+	map_sensor_alignmentFill		= array, U08,	249,	[3],	"unit", 1, 0, 0, 100, 0
 	clt_tempC_1						= scalar, F32,	252,	"*C", 1, 0, -40, 200, 1
 	clt_tempC_2						= scalar, F32,	256,	"*C", 1, 0, -40, 200, 1
 	clt_tempC_3						= scalar, F32,	260,	"*C", 1, 0, -40, 200, 1
@@ -157,7 +157,7 @@ page = 1
 	clt_resistance_3				= scalar, F32,	272,	"Ohm", 1, 0, 0, 200000, 1
 	clt_bias_resistor				= scalar, F32,	276,	"Ohm", 1, 0, 0, 200000, 1
 	clt_adcChannel				 = bits, U08, 280, [0:4] "PA2", "PA3", "INVALID", "PD3", "INVALID", "INVALID", "INVALID", "PB12", "PB13", "INVALID", "PE2", "INVALID", "PC14", "PC15", "PC16", "PC17", "Disabled", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-;no TS info - skipping clt_alignmentFill_at_29 offset 281
+	clt_alignmentFill_at_29			= array, U08,	281,	[3],	"units", 1, 0, -20, 100, 0
 	iat_tempC_1						= scalar, F32,	284,	"*C", 1, 0, -40, 200, 1
 	iat_tempC_2						= scalar, F32,	288,	"*C", 1, 0, -40, 200, 1
 	iat_tempC_3						= scalar, F32,	292,	"*C", 1, 0, -40, 200, 1
@@ -166,7 +166,7 @@ page = 1
 	iat_resistance_3				= scalar, F32,	304,	"Ohm", 1, 0, 0, 200000, 1
 	iat_bias_resistor				= scalar, F32,	308,	"Ohm", 1, 0, 0, 200000, 1
 	iat_adcChannel				 = bits, U08, 312, [0:4] "PA2", "PA3", "INVALID", "PD3", "INVALID", "INVALID", "INVALID", "PB12", "PB13", "INVALID", "PE2", "INVALID", "PC14", "PC15", "PC16", "PC17", "Disabled", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-;no TS info - skipping iat_alignmentFill_at_29 offset 313
+	iat_alignmentFill_at_29			= array, U08,	313,	[3],	"units", 1, 0, -20, 100, 0
 	launchRpm						= scalar, S32,	316,	"rpm", 1, 0, 0, 20000.0, 2
 	launchTimingRetard				= scalar, S32,	320,	"deg", 1, 0, -180, 180, 2
 	hip9011PrescalerAndSDO			= scalar, S32,	324,	"integer", 1, 0.0, 0.0, 32, 0
@@ -255,7 +255,7 @@ page = 1
 	camInputs3					 = bits, U08, 558, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "N/A", "N/A", "PA10", "PA11", "PA12", "PA13", "N/A", "N/A", "N/A", "N/A", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "N/A", "N/A", "N/A", "N/A", "PB12", "PB13", "N/A", "N/A", "N/A", "N/A", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "N/A", "N/A", "N/A", "N/A", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "PD15", "PD16", "N/A", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 	camInputs4					 = bits, U08, 559, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "N/A", "N/A", "PA10", "PA11", "PA12", "PA13", "N/A", "N/A", "N/A", "N/A", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "N/A", "N/A", "N/A", "N/A", "PB12", "PB13", "N/A", "N/A", "N/A", "N/A", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "N/A", "N/A", "N/A", "N/A", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "PD15", "PD16", "N/A", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 	afr_hwChannel				 = bits, U08, 560, [0:4] "PA2", "PA3", "INVALID", "PD3", "INVALID", "INVALID", "INVALID", "PB12", "PB13", "INVALID", "PE2", "INVALID", "PC14", "PC15", "PC16", "PC17", "Disabled", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-;no TS info - skipping afr_alignmentFill_afr offset 561
+	afr_alignmentFill_afr			= array, U08,	561,	[3],	"unit", 1, 0, 0, 100, 0
 	afr_v1							= scalar, F32,	564,	 "volts", 1, 0.0, 0, 10.0, 2
 	afr_value1						= scalar, F32,	568,	 "AFR", 1, 0.0, 0, 1000.0, 2
 	afr_v2							= scalar, F32,	572,	 "volts", 1, 0.0, 0, 10.0, 2
@@ -268,7 +268,7 @@ page = 1
 	baroSensor_highValue			= scalar, F32,	588,	"kpa", 1, 0, -400, 800, 2
 	baroSensor_type				 = bits, U32, 592, [0:3] "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "type12", "type13", "INVALID", "INVALID"
 	baroSensor_hwChannel		 = bits, U08, 596, [0:4] "PA2", "PA3", "INVALID", "PD3", "INVALID", "INVALID", "INVALID", "PB12", "PB13", "INVALID", "PE2", "INVALID", "PC14", "PC15", "PC16", "PC17", "Disabled", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-;no TS info - skipping baroSensor_alignmentFill offset 597
+	baroSensor_alignmentFill		= array, U08,	597,	[3],	"unit", 1, 0, 0, 100, 0
 	idle_solenoidFrequency			= scalar, S32,	600,	"Hz", 1, 0, 0, 3000, 0
 	idle_solenoidPin			 = bits, U08, 604, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "N/A", "N/A", "PA10", "PA11", "PA12", "PA13", "N/A", "N/A", "N/A", "N/A", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "N/A", "N/A", "N/A", "N/A", "PB12", "PB13", "N/A", "N/A", "N/A", "N/A", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "N/A", "N/A", "N/A", "N/A", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "PD15", "PD16", "N/A", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 	idle_stepperDirectionPin	 = bits, U08, 605, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@@ -833,7 +833,7 @@ page = 1
 	throttlePedalSecondaryUpVoltage		= scalar, F32,	2100,	"voltage", 1, 0, -6, 6, 2
 	throttlePedalSecondaryWOTVoltage		= scalar, F32,	2104,	"voltage", 1, 0, -6, 6, 2
 	canBaudRate					 = bits, U08, 2108, [0:1], "100kbps", "250kbps" , "500kbps", "1Mbps"
-;no TS info - skipping alignmentFill_at_2109 offset 2109
+	alignmentFill_at_2109			= array, U08,	2109,	[3],	"units", 1, 0, -20, 100, 0
 	unused_former_warmup_target_afr		= array, U32,	2112,	[5],	"units", 1, 0, -20, 100, 0
 	boostCutPressure				= scalar, F32,	2132,	"kPa", 1, 0, 0, 500, 0
 	mapAccelTaperBins				= array, F32,	2136,	[8],	"counter", 1, 0, 0.0, 300, 0
@@ -887,7 +887,7 @@ page = 1
 	auxTempSensor1_resistance_3		= scalar, F32,	2464,	"Ohm", 1, 0, 0, 200000, 1
 	auxTempSensor1_bias_resistor		= scalar, F32,	2468,	"Ohm", 1, 0, 0, 200000, 1
 	auxTempSensor1_adcChannel	 = bits, U08, 2472, [0:4] "PA2", "PA3", "INVALID", "PD3", "INVALID", "INVALID", "INVALID", "PB12", "PB13", "INVALID", "PE2", "INVALID", "PC14", "PC15", "PC16", "PC17", "Disabled", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-;no TS info - skipping auxTempSensor1_alignmentFill_at_29 offset 2473
+	auxTempSensor1_alignmentFill_at_29		= array, U08,	2473,	[3],	"units", 1, 0, -20, 100, 0
 	auxTempSensor2_tempC_1			= scalar, F32,	2476,	"*C", 1, 0, -40, 200, 1
 	auxTempSensor2_tempC_2			= scalar, F32,	2480,	"*C", 1, 0, -40, 200, 1
 	auxTempSensor2_tempC_3			= scalar, F32,	2484,	"*C", 1, 0, -40, 200, 1
@@ -896,7 +896,7 @@ page = 1
 	auxTempSensor2_resistance_3		= scalar, F32,	2496,	"Ohm", 1, 0, 0, 200000, 1
 	auxTempSensor2_bias_resistor		= scalar, F32,	2500,	"Ohm", 1, 0, 0, 200000, 1
 	auxTempSensor2_adcChannel	 = bits, U08, 2504, [0:4] "PA2", "PA3", "INVALID", "PD3", "INVALID", "INVALID", "INVALID", "PB12", "PB13", "INVALID", "PE2", "INVALID", "PC14", "PC15", "PC16", "PC17", "Disabled", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-;no TS info - skipping auxTempSensor2_alignmentFill_at_29 offset 2505
+	auxTempSensor2_alignmentFill_at_29		= array, U08,	2505,	[3],	"units", 1, 0, -20, 100, 0
 	unused2508						= array, U08,	2508,	[6],	"units", 1, 0, -20, 100, 0
 	etbFreq							= scalar, S16,	2514,	"Hz", 1, 0, 0, 30000, 0
 	unused2516						= array, U08,	2516,	[24],	"units", 1, 0, -20, 100, 0
@@ -960,7 +960,7 @@ page = 1
 	auxPid4_minValue				= scalar, S16,	2688,	"", 1, 0, -30000, 30000.0, 0
 	auxPid4_maxValue				= scalar, S16,	2690,	"", 1, 0, -30000, 30000.0, 0
 	oilPressure_hwChannel		 = bits, U08, 2692, [0:4] "PA2", "PA3", "INVALID", "PD3", "INVALID", "INVALID", "INVALID", "PB12", "PB13", "INVALID", "PE2", "INVALID", "PC14", "PC15", "PC16", "PC17", "Disabled", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-;no TS info - skipping oilPressure_alignmentFill offset 2693
+	oilPressure_alignmentFill		= array, U08,	2693,	[3],	"unit", 1, 0, 0, 100, 0
 	oilPressure_v1					= scalar, F32,	2696,	 "volts", 1, 0.0, 0, 10.0, 2
 	oilPressure_value1				= scalar, F32,	2700,	 "kPa", 1, 0.0, 0, 1000.0, 2
 	oilPressure_v2					= scalar, F32,	2704,	 "volts", 1, 0.0, 0, 10.0, 2
@@ -1063,7 +1063,7 @@ page = 1
 	gppwm1_onAboveDuty				= scalar, U08,	4148,	"%", 1, 0, 0, 100, 0
 	gppwm1_offBelowDuty				= scalar, U08,	4149,	"%", 1, 0, 0, 100, 0
 	gppwm1_loadAxis				 = bits, U08, 4150, [0:1], "TPS", "MAP", "CLT", "IAT"
-;no TS info - skipping gppwm1_alignmentFill offset 4151
+	gppwm1_alignmentFill_map		= scalar, U08,	4151,	"unit", 1, 0, 0, 100, 0
 	gppwm1_loadBins					= array, U08,	4152,	[8],	"load", 1, 0, 0.0, 250, 0
 	gppwm1_rpmBins					= array, U08,	4160,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
 	gppwm1_table				 = array, U08, 4168, [8x8], "duty", 1, 0, 0, 100, 0
@@ -1073,7 +1073,7 @@ page = 1
 	gppwm2_onAboveDuty				= scalar, U08,	4236,	"%", 1, 0, 0, 100, 0
 	gppwm2_offBelowDuty				= scalar, U08,	4237,	"%", 1, 0, 0, 100, 0
 	gppwm2_loadAxis				 = bits, U08, 4238, [0:1], "TPS", "MAP", "CLT", "IAT"
-;no TS info - skipping gppwm2_alignmentFill offset 4239
+	gppwm2_alignmentFill_map		= scalar, U08,	4239,	"unit", 1, 0, 0, 100, 0
 	gppwm2_loadBins					= array, U08,	4240,	[8],	"load", 1, 0, 0.0, 250, 0
 	gppwm2_rpmBins					= array, U08,	4248,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
 	gppwm2_table				 = array, U08, 4256, [8x8], "duty", 1, 0, 0, 100, 0
@@ -1083,7 +1083,7 @@ page = 1
 	gppwm3_onAboveDuty				= scalar, U08,	4324,	"%", 1, 0, 0, 100, 0
 	gppwm3_offBelowDuty				= scalar, U08,	4325,	"%", 1, 0, 0, 100, 0
 	gppwm3_loadAxis				 = bits, U08, 4326, [0:1], "TPS", "MAP", "CLT", "IAT"
-;no TS info - skipping gppwm3_alignmentFill offset 4327
+	gppwm3_alignmentFill_map		= scalar, U08,	4327,	"unit", 1, 0, 0, 100, 0
 	gppwm3_loadBins					= array, U08,	4328,	[8],	"load", 1, 0, 0.0, 250, 0
 	gppwm3_rpmBins					= array, U08,	4336,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
 	gppwm3_table				 = array, U08, 4344, [8x8], "duty", 1, 0, 0, 100, 0
@@ -1093,7 +1093,7 @@ page = 1
 	gppwm4_onAboveDuty				= scalar, U08,	4412,	"%", 1, 0, 0, 100, 0
 	gppwm4_offBelowDuty				= scalar, U08,	4413,	"%", 1, 0, 0, 100, 0
 	gppwm4_loadAxis				 = bits, U08, 4414, [0:1], "TPS", "MAP", "CLT", "IAT"
-;no TS info - skipping gppwm4_alignmentFill offset 4415
+	gppwm4_alignmentFill_map		= scalar, U08,	4415,	"unit", 1, 0, 0, 100, 0
 	gppwm4_loadBins					= array, U08,	4416,	[8],	"load", 1, 0, 0.0, 250, 0
 	gppwm4_rpmBins					= array, U08,	4424,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
 	gppwm4_table				 = array, U08, 4432, [8x8], "duty", 1, 0, 0, 100, 0
@@ -1106,7 +1106,7 @@ page = 1
 	mc33_t_bypass					= scalar, U16,	4508,	"X", 1, 0.0, 0, 64000, 0
 	mc33_t_hold_off					= scalar, U16,	4510,	"X", 1, 0.0, 0, 64000, 0
 	mc33_t_hold_tot					= scalar, U16,	4512,	"X", 1, 0.0, 0, 64000, 0
-;no TS info - skipping alignmentFill_at_4514 offset 4514
+	alignmentFill_at_4514			= array, U08,	4514,	[2],	"units", 1, 0, -20, 100, 0
 	mainUnusedEnd					= array, S32,	4516,	[371],	"units", 1, 0, -20, 100, 0
 	warning_message				 = string, ASCII, 6000, 120
 	afterstartCoolantBins			= array, F32,	6120,	[8],	"C", 1, 0, -100.0, 250.0, 0
diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini
index 61ce97cb36..582efe1649 100644
--- a/firmware/tunerstudio/rusefi_microrusefi.ini
+++ b/firmware/tunerstudio/rusefi_microrusefi.ini
@@ -46,12 +46,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
- 	signature    = "rusEFI 2020.06.30.mre.80367272" 
+ 	signature    = "rusEFI 2020.07.01.mre.845703192" 
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2020.06.30.mre.80367272" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2020.07.01.mre.845703192" ; signature is expected to be 7 or more characters.
 
 [Constants]
 ; new packet serial format with CRC
@@ -89,7 +89,7 @@ enable2ndByteCanID = false
 
 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 30 19:19:31 UTC 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 01 01:01:11 UTC 2020
 
 pageSize            = 20000
 page = 1
@@ -136,7 +136,7 @@ page = 1
 	tpsErrorDetectionTooHigh		= scalar, S16,	86,	"%", 1, 0, 100, 110, 0
 	cranking_baseFuel				= scalar, F32,	88,	"ms", 1, 0, 0, 200, 1
 	cranking_rpm					= scalar, S16,	92,	"RPM", 1, 0, 0, 3000, 0
-;no TS info - skipping cranking_alignmentFill_at_6 offset 94
+	cranking_alignmentFill_at_6		= array, U08,	94,	[2],	"units", 1, 0, -20, 100, 0
 	primingSquirtDurationMs			= scalar, F32,	96,	"*C", 1, 0, -40, 200, 1
 	ignitionDwellForCrankingMs		= scalar, F32,	100,	"ms", 1, 0, 0, 200, 1
 	crankingChargeAngle				= scalar, F32,	104,	"deg", 1, 0, 0, 3000.0, 0
@@ -148,7 +148,7 @@ page = 1
 	map_sensor_highValue			= scalar, F32,	240,	"kpa", 1, 0, -400, 800, 2
 	map_sensor_type				 = bits, U32, 244, [0:3] "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "type12", "type13", "INVALID", "INVALID"
 	map_sensor_hwChannel		 = bits, U08, 248, [0:4] "18 - AN temp 1","23 - AN temp 2","24 - AN temp 3","22 - AN temp 4","28 - AN volt 10","INVALID","26 - AN volt 2","31 - AN volt 3","36 - AN volt 8","40 - AN volt 9","27 - AN volt 1","Battery Sense","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6","30 - AN volt 7","NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-;no TS info - skipping map_sensor_alignmentFill offset 249
+	map_sensor_alignmentFill		= array, U08,	249,	[3],	"unit", 1, 0, 0, 100, 0
 	clt_tempC_1						= scalar, F32,	252,	"*C", 1, 0, -40, 200, 1
 	clt_tempC_2						= scalar, F32,	256,	"*C", 1, 0, -40, 200, 1
 	clt_tempC_3						= scalar, F32,	260,	"*C", 1, 0, -40, 200, 1
@@ -157,7 +157,7 @@ page = 1
 	clt_resistance_3				= scalar, F32,	272,	"Ohm", 1, 0, 0, 200000, 1
 	clt_bias_resistor				= scalar, F32,	276,	"Ohm", 1, 0, 0, 200000, 1
 	clt_adcChannel				 = bits, U08, 280, [0:4] "18 - AN temp 1","23 - AN temp 2","24 - AN temp 3","22 - AN temp 4","28 - AN volt 10","INVALID","26 - AN volt 2","31 - AN volt 3","36 - AN volt 8","40 - AN volt 9","27 - AN volt 1","Battery Sense","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6","30 - AN volt 7","NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-;no TS info - skipping clt_alignmentFill_at_29 offset 281
+	clt_alignmentFill_at_29			= array, U08,	281,	[3],	"units", 1, 0, -20, 100, 0
 	iat_tempC_1						= scalar, F32,	284,	"*C", 1, 0, -40, 200, 1
 	iat_tempC_2						= scalar, F32,	288,	"*C", 1, 0, -40, 200, 1
 	iat_tempC_3						= scalar, F32,	292,	"*C", 1, 0, -40, 200, 1
@@ -166,7 +166,7 @@ page = 1
 	iat_resistance_3				= scalar, F32,	304,	"Ohm", 1, 0, 0, 200000, 1
 	iat_bias_resistor				= scalar, F32,	308,	"Ohm", 1, 0, 0, 200000, 1
 	iat_adcChannel				 = bits, U08, 312, [0:4] "18 - AN temp 1","23 - AN temp 2","24 - AN temp 3","22 - AN temp 4","28 - AN volt 10","INVALID","26 - AN volt 2","31 - AN volt 3","36 - AN volt 8","40 - AN volt 9","27 - AN volt 1","Battery Sense","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6","30 - AN volt 7","NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-;no TS info - skipping iat_alignmentFill_at_29 offset 313
+	iat_alignmentFill_at_29			= array, U08,	313,	[3],	"units", 1, 0, -20, 100, 0
 	launchRpm						= scalar, S32,	316,	"rpm", 1, 0, 0, 20000.0, 2
 	launchTimingRetard				= scalar, S32,	320,	"deg", 1, 0, -180, 180, 2
 	hip9011PrescalerAndSDO			= scalar, S32,	324,	"integer", 1, 0.0, 0.0, 32, 0
@@ -255,7 +255,7 @@ page = 1
 	camInputs3					 = bits, U08, 558, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","25 - Hall Cam","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","45 - VR/Hall Crank","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 	camInputs4					 = bits, U08, 559, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","25 - Hall Cam","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","45 - VR/Hall Crank","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 	afr_hwChannel				 = bits, U08, 560, [0:4] "18 - AN temp 1","23 - AN temp 2","24 - AN temp 3","22 - AN temp 4","28 - AN volt 10","INVALID","26 - AN volt 2","31 - AN volt 3","36 - AN volt 8","40 - AN volt 9","27 - AN volt 1","Battery Sense","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6","30 - AN volt 7","NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-;no TS info - skipping afr_alignmentFill_afr offset 561
+	afr_alignmentFill_afr			= array, U08,	561,	[3],	"unit", 1, 0, 0, 100, 0
 	afr_v1							= scalar, F32,	564,	 "volts", 1, 0.0, 0, 10.0, 2
 	afr_value1						= scalar, F32,	568,	 "AFR", 1, 0.0, 0, 1000.0, 2
 	afr_v2							= scalar, F32,	572,	 "volts", 1, 0.0, 0, 10.0, 2
@@ -268,7 +268,7 @@ page = 1
 	baroSensor_highValue			= scalar, F32,	588,	"kpa", 1, 0, -400, 800, 2
 	baroSensor_type				 = bits, U32, 592, [0:3] "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "type12", "type13", "INVALID", "INVALID"
 	baroSensor_hwChannel		 = bits, U08, 596, [0:4] "18 - AN temp 1","23 - AN temp 2","24 - AN temp 3","22 - AN temp 4","28 - AN volt 10","INVALID","26 - AN volt 2","31 - AN volt 3","36 - AN volt 8","40 - AN volt 9","27 - AN volt 1","Battery Sense","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6","30 - AN volt 7","NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-;no TS info - skipping baroSensor_alignmentFill offset 597
+	baroSensor_alignmentFill		= array, U08,	597,	[3],	"unit", 1, 0, 0, 100, 0
 	idle_solenoidFrequency			= scalar, S32,	600,	"Hz", 1, 0, 0, 3000, 0
 	idle_solenoidPin			 = bits, U08, 604, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","AUX J2 PA15","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","AUX J2 PB8","AUX J2 PB9","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","AUX J2 PC12","INVALID","INVALID","INVALID","INVALID","12 - Ignition 4","11 - Ignition 3","10 - Ignition 2","9 - Ignition 1","INVALID","13 - GP Out 6","14 - GP Out 5","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","35 - GP Out 1","7 - Lowside 1","3 - Lowside 2","42 - Injector 4","41 - Injector 3","38 - Injector 2","37 - Injector 1","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","34 - GP Out 2","33 - GP Out 3","43 - GP Out 4","INVALID","INVALID","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 	idle_stepperDirectionPin	 = bits, U08, 605, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@@ -833,7 +833,7 @@ page = 1
 	throttlePedalSecondaryUpVoltage		= scalar, F32,	2100,	"voltage", 1, 0, -6, 6, 2
 	throttlePedalSecondaryWOTVoltage		= scalar, F32,	2104,	"voltage", 1, 0, -6, 6, 2
 	canBaudRate					 = bits, U08, 2108, [0:1], "100kbps", "250kbps" , "500kbps", "1Mbps"
-;no TS info - skipping alignmentFill_at_2109 offset 2109
+	alignmentFill_at_2109			= array, U08,	2109,	[3],	"units", 1, 0, -20, 100, 0
 	unused_former_warmup_target_afr		= array, U32,	2112,	[5],	"units", 1, 0, -20, 100, 0
 	boostCutPressure				= scalar, F32,	2132,	"kPa", 1, 0, 0, 500, 0
 	mapAccelTaperBins				= array, F32,	2136,	[8],	"counter", 1, 0, 0.0, 300, 0
@@ -887,7 +887,7 @@ page = 1
 	auxTempSensor1_resistance_3		= scalar, F32,	2464,	"Ohm", 1, 0, 0, 200000, 1
 	auxTempSensor1_bias_resistor		= scalar, F32,	2468,	"Ohm", 1, 0, 0, 200000, 1
 	auxTempSensor1_adcChannel	 = bits, U08, 2472, [0:4] "18 - AN temp 1","23 - AN temp 2","24 - AN temp 3","22 - AN temp 4","28 - AN volt 10","INVALID","26 - AN volt 2","31 - AN volt 3","36 - AN volt 8","40 - AN volt 9","27 - AN volt 1","Battery Sense","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6","30 - AN volt 7","NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-;no TS info - skipping auxTempSensor1_alignmentFill_at_29 offset 2473
+	auxTempSensor1_alignmentFill_at_29		= array, U08,	2473,	[3],	"units", 1, 0, -20, 100, 0
 	auxTempSensor2_tempC_1			= scalar, F32,	2476,	"*C", 1, 0, -40, 200, 1
 	auxTempSensor2_tempC_2			= scalar, F32,	2480,	"*C", 1, 0, -40, 200, 1
 	auxTempSensor2_tempC_3			= scalar, F32,	2484,	"*C", 1, 0, -40, 200, 1
@@ -896,7 +896,7 @@ page = 1
 	auxTempSensor2_resistance_3		= scalar, F32,	2496,	"Ohm", 1, 0, 0, 200000, 1
 	auxTempSensor2_bias_resistor		= scalar, F32,	2500,	"Ohm", 1, 0, 0, 200000, 1
 	auxTempSensor2_adcChannel	 = bits, U08, 2504, [0:4] "18 - AN temp 1","23 - AN temp 2","24 - AN temp 3","22 - AN temp 4","28 - AN volt 10","INVALID","26 - AN volt 2","31 - AN volt 3","36 - AN volt 8","40 - AN volt 9","27 - AN volt 1","Battery Sense","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6","30 - AN volt 7","NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-;no TS info - skipping auxTempSensor2_alignmentFill_at_29 offset 2505
+	auxTempSensor2_alignmentFill_at_29		= array, U08,	2505,	[3],	"units", 1, 0, -20, 100, 0
 	unused2508						= array, U08,	2508,	[6],	"units", 1, 0, -20, 100, 0
 	etbFreq							= scalar, S16,	2514,	"Hz", 1, 0, 0, 30000, 0
 	unused2516						= array, U08,	2516,	[24],	"units", 1, 0, -20, 100, 0
@@ -960,7 +960,7 @@ page = 1
 	auxPid4_minValue				= scalar, S16,	2688,	"", 1, 0, -30000, 30000.0, 0
 	auxPid4_maxValue				= scalar, S16,	2690,	"", 1, 0, -30000, 30000.0, 0
 	oilPressure_hwChannel		 = bits, U08, 2692, [0:4] "18 - AN temp 1","23 - AN temp 2","24 - AN temp 3","22 - AN temp 4","28 - AN volt 10","INVALID","26 - AN volt 2","31 - AN volt 3","36 - AN volt 8","40 - AN volt 9","27 - AN volt 1","Battery Sense","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6","30 - AN volt 7","NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-;no TS info - skipping oilPressure_alignmentFill offset 2693
+	oilPressure_alignmentFill		= array, U08,	2693,	[3],	"unit", 1, 0, 0, 100, 0
 	oilPressure_v1					= scalar, F32,	2696,	 "volts", 1, 0.0, 0, 10.0, 2
 	oilPressure_value1				= scalar, F32,	2700,	 "kPa", 1, 0.0, 0, 1000.0, 2
 	oilPressure_v2					= scalar, F32,	2704,	 "volts", 1, 0.0, 0, 10.0, 2
@@ -1063,7 +1063,7 @@ page = 1
 	gppwm1_onAboveDuty				= scalar, U08,	4148,	"%", 1, 0, 0, 100, 0
 	gppwm1_offBelowDuty				= scalar, U08,	4149,	"%", 1, 0, 0, 100, 0
 	gppwm1_loadAxis				 = bits, U08, 4150, [0:1], "TPS", "MAP", "CLT", "IAT"
-;no TS info - skipping gppwm1_alignmentFill offset 4151
+	gppwm1_alignmentFill_map		= scalar, U08,	4151,	"unit", 1, 0, 0, 100, 0
 	gppwm1_loadBins					= array, U08,	4152,	[8],	"load", 1, 0, 0.0, 250, 0
 	gppwm1_rpmBins					= array, U08,	4160,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
 	gppwm1_table				 = array, U08, 4168, [8x8], "duty", 1, 0, 0, 100, 0
@@ -1073,7 +1073,7 @@ page = 1
 	gppwm2_onAboveDuty				= scalar, U08,	4236,	"%", 1, 0, 0, 100, 0
 	gppwm2_offBelowDuty				= scalar, U08,	4237,	"%", 1, 0, 0, 100, 0
 	gppwm2_loadAxis				 = bits, U08, 4238, [0:1], "TPS", "MAP", "CLT", "IAT"
-;no TS info - skipping gppwm2_alignmentFill offset 4239
+	gppwm2_alignmentFill_map		= scalar, U08,	4239,	"unit", 1, 0, 0, 100, 0
 	gppwm2_loadBins					= array, U08,	4240,	[8],	"load", 1, 0, 0.0, 250, 0
 	gppwm2_rpmBins					= array, U08,	4248,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
 	gppwm2_table				 = array, U08, 4256, [8x8], "duty", 1, 0, 0, 100, 0
@@ -1083,7 +1083,7 @@ page = 1
 	gppwm3_onAboveDuty				= scalar, U08,	4324,	"%", 1, 0, 0, 100, 0
 	gppwm3_offBelowDuty				= scalar, U08,	4325,	"%", 1, 0, 0, 100, 0
 	gppwm3_loadAxis				 = bits, U08, 4326, [0:1], "TPS", "MAP", "CLT", "IAT"
-;no TS info - skipping gppwm3_alignmentFill offset 4327
+	gppwm3_alignmentFill_map		= scalar, U08,	4327,	"unit", 1, 0, 0, 100, 0
 	gppwm3_loadBins					= array, U08,	4328,	[8],	"load", 1, 0, 0.0, 250, 0
 	gppwm3_rpmBins					= array, U08,	4336,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
 	gppwm3_table				 = array, U08, 4344, [8x8], "duty", 1, 0, 0, 100, 0
@@ -1093,7 +1093,7 @@ page = 1
 	gppwm4_onAboveDuty				= scalar, U08,	4412,	"%", 1, 0, 0, 100, 0
 	gppwm4_offBelowDuty				= scalar, U08,	4413,	"%", 1, 0, 0, 100, 0
 	gppwm4_loadAxis				 = bits, U08, 4414, [0:1], "TPS", "MAP", "CLT", "IAT"
-;no TS info - skipping gppwm4_alignmentFill offset 4415
+	gppwm4_alignmentFill_map		= scalar, U08,	4415,	"unit", 1, 0, 0, 100, 0
 	gppwm4_loadBins					= array, U08,	4416,	[8],	"load", 1, 0, 0.0, 250, 0
 	gppwm4_rpmBins					= array, U08,	4424,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
 	gppwm4_table				 = array, U08, 4432, [8x8], "duty", 1, 0, 0, 100, 0
@@ -1106,7 +1106,7 @@ page = 1
 	mc33_t_bypass					= scalar, U16,	4508,	"X", 1, 0.0, 0, 64000, 0
 	mc33_t_hold_off					= scalar, U16,	4510,	"X", 1, 0.0, 0, 64000, 0
 	mc33_t_hold_tot					= scalar, U16,	4512,	"X", 1, 0.0, 0, 64000, 0
-;no TS info - skipping alignmentFill_at_4514 offset 4514
+	alignmentFill_at_4514			= array, U08,	4514,	[2],	"units", 1, 0, -20, 100, 0
 	mainUnusedEnd					= array, S32,	4516,	[371],	"units", 1, 0, -20, 100, 0
 	warning_message				 = string, ASCII, 6000, 120
 	afterstartCoolantBins			= array, F32,	6120,	[8],	"C", 1, 0, -100.0, 250.0, 0
diff --git a/firmware/tunerstudio/rusefi_prometheus.ini b/firmware/tunerstudio/rusefi_prometheus.ini
index 8e53491b08..91d66f3c4e 100644
--- a/firmware/tunerstudio/rusefi_prometheus.ini
+++ b/firmware/tunerstudio/rusefi_prometheus.ini
@@ -46,12 +46,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
- 	signature    = "rusEFI 2020.06.30.pth.40090232" 
+ 	signature    = "rusEFI 2020.07.01.pth.373219180" 
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2020.06.30.pth.40090232" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2020.07.01.pth.373219180" ; signature is expected to be 7 or more characters.
 
 [Constants]
 ; new packet serial format with CRC
@@ -89,7 +89,7 @@ enable2ndByteCanID = false
 
 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 30 19:19:34 UTC 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 01 01:01:13 UTC 2020
 
 pageSize            = 20000
 page = 1
@@ -136,7 +136,7 @@ page = 1
 	tpsErrorDetectionTooHigh		= scalar, S16,	86,	"%", 1, 0, 100, 110, 0
 	cranking_baseFuel				= scalar, F32,	88,	"ms", 1, 0, 0, 200, 1
 	cranking_rpm					= scalar, S16,	92,	"RPM", 1, 0, 0, 3000, 0
-;no TS info - skipping cranking_alignmentFill_at_6 offset 94
+	cranking_alignmentFill_at_6		= array, U08,	94,	[2],	"units", 1, 0, -20, 100, 0
 	primingSquirtDurationMs			= scalar, F32,	96,	"*C", 1, 0, -40, 200, 1
 	ignitionDwellForCrankingMs		= scalar, F32,	100,	"ms", 1, 0, 0, 200, 1
 	crankingChargeAngle				= scalar, F32,	104,	"deg", 1, 0, 0, 3000.0, 0
@@ -148,7 +148,7 @@ page = 1
 	map_sensor_highValue			= scalar, F32,	240,	"kpa", 1, 0, -400, 800, 2
 	map_sensor_type				 = bits, U32, 244, [0:3] "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "type12", "type13", "INVALID", "INVALID"
 	map_sensor_hwChannel		 = bits, U08, 248, [0:4] "Analog 3O","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-;no TS info - skipping map_sensor_alignmentFill offset 249
+	map_sensor_alignmentFill		= array, U08,	249,	[3],	"unit", 1, 0, 0, 100, 0
 	clt_tempC_1						= scalar, F32,	252,	"*C", 1, 0, -40, 200, 1
 	clt_tempC_2						= scalar, F32,	256,	"*C", 1, 0, -40, 200, 1
 	clt_tempC_3						= scalar, F32,	260,	"*C", 1, 0, -40, 200, 1
@@ -157,7 +157,7 @@ page = 1
 	clt_resistance_3				= scalar, F32,	272,	"Ohm", 1, 0, 0, 200000, 1
 	clt_bias_resistor				= scalar, F32,	276,	"Ohm", 1, 0, 0, 200000, 1
 	clt_adcChannel				 = bits, U08, 280, [0:4] "Analog 3O","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-;no TS info - skipping clt_alignmentFill_at_29 offset 281
+	clt_alignmentFill_at_29			= array, U08,	281,	[3],	"units", 1, 0, -20, 100, 0
 	iat_tempC_1						= scalar, F32,	284,	"*C", 1, 0, -40, 200, 1
 	iat_tempC_2						= scalar, F32,	288,	"*C", 1, 0, -40, 200, 1
 	iat_tempC_3						= scalar, F32,	292,	"*C", 1, 0, -40, 200, 1
@@ -166,7 +166,7 @@ page = 1
 	iat_resistance_3				= scalar, F32,	304,	"Ohm", 1, 0, 0, 200000, 1
 	iat_bias_resistor				= scalar, F32,	308,	"Ohm", 1, 0, 0, 200000, 1
 	iat_adcChannel				 = bits, U08, 312, [0:4] "Analog 3O","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-;no TS info - skipping iat_alignmentFill_at_29 offset 313
+	iat_alignmentFill_at_29			= array, U08,	313,	[3],	"units", 1, 0, -20, 100, 0
 	launchRpm						= scalar, S32,	316,	"rpm", 1, 0, 0, 20000.0, 2
 	launchTimingRetard				= scalar, S32,	320,	"deg", 1, 0, -180, 180, 2
 	hip9011PrescalerAndSDO			= scalar, S32,	324,	"integer", 1, 0.0, 0.0, 32, 0
@@ -255,7 +255,7 @@ page = 1
 	camInputs3					 = bits, U08, 558, [0:7], "NONE", "INVALID", "INVALID", "PA1", "PA2", "PA3", "INVALID", "PA5", "PA6", "PA7", "PA8", "PA9", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA15", "INVALID", "INVALID", "INVALID", "PB3", "PB4", "PB5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "PC7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PE5", "PE6", "INVALID", "INVALID", "PE9", "INVALID", "PE11", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 	camInputs4					 = bits, U08, 559, [0:7], "NONE", "INVALID", "INVALID", "PA1", "PA2", "PA3", "INVALID", "PA5", "PA6", "PA7", "PA8", "PA9", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA15", "INVALID", "INVALID", "INVALID", "PB3", "PB4", "PB5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "PC7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PE5", "PE6", "INVALID", "INVALID", "PE9", "INVALID", "PE11", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 	afr_hwChannel				 = bits, U08, 560, [0:4] "Analog 3O","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-;no TS info - skipping afr_alignmentFill_afr offset 561
+	afr_alignmentFill_afr			= array, U08,	561,	[3],	"unit", 1, 0, 0, 100, 0
 	afr_v1							= scalar, F32,	564,	 "volts", 1, 0.0, 0, 10.0, 2
 	afr_value1						= scalar, F32,	568,	 "AFR", 1, 0.0, 0, 1000.0, 2
 	afr_v2							= scalar, F32,	572,	 "volts", 1, 0.0, 0, 10.0, 2
@@ -268,7 +268,7 @@ page = 1
 	baroSensor_highValue			= scalar, F32,	588,	"kpa", 1, 0, -400, 800, 2
 	baroSensor_type				 = bits, U32, 592, [0:3] "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "type12", "type13", "INVALID", "INVALID"
 	baroSensor_hwChannel		 = bits, U08, 596, [0:4] "Analog 3O","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-;no TS info - skipping baroSensor_alignmentFill offset 597
+	baroSensor_alignmentFill		= array, U08,	597,	[3],	"unit", 1, 0, 0, 100, 0
 	idle_solenoidFrequency			= scalar, S32,	600,	"Hz", 1, 0, 0, 3000, 0
 	idle_solenoidPin			 = bits, U08, 604, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Injector 3Z","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 	idle_stepperDirectionPin	 = bits, U08, 605, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@@ -833,7 +833,7 @@ page = 1
 	throttlePedalSecondaryUpVoltage		= scalar, F32,	2100,	"voltage", 1, 0, -6, 6, 2
 	throttlePedalSecondaryWOTVoltage		= scalar, F32,	2104,	"voltage", 1, 0, -6, 6, 2
 	canBaudRate					 = bits, U08, 2108, [0:1], "100kbps", "250kbps" , "500kbps", "1Mbps"
-;no TS info - skipping alignmentFill_at_2109 offset 2109
+	alignmentFill_at_2109			= array, U08,	2109,	[3],	"units", 1, 0, -20, 100, 0
 	unused_former_warmup_target_afr		= array, U32,	2112,	[5],	"units", 1, 0, -20, 100, 0
 	boostCutPressure				= scalar, F32,	2132,	"kPa", 1, 0, 0, 500, 0
 	mapAccelTaperBins				= array, F32,	2136,	[8],	"counter", 1, 0, 0.0, 300, 0
@@ -887,7 +887,7 @@ page = 1
 	auxTempSensor1_resistance_3		= scalar, F32,	2464,	"Ohm", 1, 0, 0, 200000, 1
 	auxTempSensor1_bias_resistor		= scalar, F32,	2468,	"Ohm", 1, 0, 0, 200000, 1
 	auxTempSensor1_adcChannel	 = bits, U08, 2472, [0:4] "Analog 3O","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-;no TS info - skipping auxTempSensor1_alignmentFill_at_29 offset 2473
+	auxTempSensor1_alignmentFill_at_29		= array, U08,	2473,	[3],	"units", 1, 0, -20, 100, 0
 	auxTempSensor2_tempC_1			= scalar, F32,	2476,	"*C", 1, 0, -40, 200, 1
 	auxTempSensor2_tempC_2			= scalar, F32,	2480,	"*C", 1, 0, -40, 200, 1
 	auxTempSensor2_tempC_3			= scalar, F32,	2484,	"*C", 1, 0, -40, 200, 1
@@ -896,7 +896,7 @@ page = 1
 	auxTempSensor2_resistance_3		= scalar, F32,	2496,	"Ohm", 1, 0, 0, 200000, 1
 	auxTempSensor2_bias_resistor		= scalar, F32,	2500,	"Ohm", 1, 0, 0, 200000, 1
 	auxTempSensor2_adcChannel	 = bits, U08, 2504, [0:4] "Analog 3O","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-;no TS info - skipping auxTempSensor2_alignmentFill_at_29 offset 2505
+	auxTempSensor2_alignmentFill_at_29		= array, U08,	2505,	[3],	"units", 1, 0, -20, 100, 0
 	unused2508						= array, U08,	2508,	[6],	"units", 1, 0, -20, 100, 0
 	etbFreq							= scalar, S16,	2514,	"Hz", 1, 0, 0, 30000, 0
 	unused2516						= array, U08,	2516,	[24],	"units", 1, 0, -20, 100, 0
@@ -960,7 +960,7 @@ page = 1
 	auxPid4_minValue				= scalar, S16,	2688,	"", 1, 0, -30000, 30000.0, 0
 	auxPid4_maxValue				= scalar, S16,	2690,	"", 1, 0, -30000, 30000.0, 0
 	oilPressure_hwChannel		 = bits, U08, 2692, [0:4] "Analog 3O","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-;no TS info - skipping oilPressure_alignmentFill offset 2693
+	oilPressure_alignmentFill		= array, U08,	2693,	[3],	"unit", 1, 0, 0, 100, 0
 	oilPressure_v1					= scalar, F32,	2696,	 "volts", 1, 0.0, 0, 10.0, 2
 	oilPressure_value1				= scalar, F32,	2700,	 "kPa", 1, 0.0, 0, 1000.0, 2
 	oilPressure_v2					= scalar, F32,	2704,	 "volts", 1, 0.0, 0, 10.0, 2
@@ -1063,7 +1063,7 @@ page = 1
 	gppwm1_onAboveDuty				= scalar, U08,	4148,	"%", 1, 0, 0, 100, 0
 	gppwm1_offBelowDuty				= scalar, U08,	4149,	"%", 1, 0, 0, 100, 0
 	gppwm1_loadAxis				 = bits, U08, 4150, [0:1], "TPS", "MAP", "CLT", "IAT"
-;no TS info - skipping gppwm1_alignmentFill offset 4151
+	gppwm1_alignmentFill_map		= scalar, U08,	4151,	"unit", 1, 0, 0, 100, 0
 	gppwm1_loadBins					= array, U08,	4152,	[8],	"load", 1, 0, 0.0, 250, 0
 	gppwm1_rpmBins					= array, U08,	4160,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
 	gppwm1_table				 = array, U08, 4168, [8x8], "duty", 1, 0, 0, 100, 0
@@ -1073,7 +1073,7 @@ page = 1
 	gppwm2_onAboveDuty				= scalar, U08,	4236,	"%", 1, 0, 0, 100, 0
 	gppwm2_offBelowDuty				= scalar, U08,	4237,	"%", 1, 0, 0, 100, 0
 	gppwm2_loadAxis				 = bits, U08, 4238, [0:1], "TPS", "MAP", "CLT", "IAT"
-;no TS info - skipping gppwm2_alignmentFill offset 4239
+	gppwm2_alignmentFill_map		= scalar, U08,	4239,	"unit", 1, 0, 0, 100, 0
 	gppwm2_loadBins					= array, U08,	4240,	[8],	"load", 1, 0, 0.0, 250, 0
 	gppwm2_rpmBins					= array, U08,	4248,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
 	gppwm2_table				 = array, U08, 4256, [8x8], "duty", 1, 0, 0, 100, 0
@@ -1083,7 +1083,7 @@ page = 1
 	gppwm3_onAboveDuty				= scalar, U08,	4324,	"%", 1, 0, 0, 100, 0
 	gppwm3_offBelowDuty				= scalar, U08,	4325,	"%", 1, 0, 0, 100, 0
 	gppwm3_loadAxis				 = bits, U08, 4326, [0:1], "TPS", "MAP", "CLT", "IAT"
-;no TS info - skipping gppwm3_alignmentFill offset 4327
+	gppwm3_alignmentFill_map		= scalar, U08,	4327,	"unit", 1, 0, 0, 100, 0
 	gppwm3_loadBins					= array, U08,	4328,	[8],	"load", 1, 0, 0.0, 250, 0
 	gppwm3_rpmBins					= array, U08,	4336,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
 	gppwm3_table				 = array, U08, 4344, [8x8], "duty", 1, 0, 0, 100, 0
@@ -1093,7 +1093,7 @@ page = 1
 	gppwm4_onAboveDuty				= scalar, U08,	4412,	"%", 1, 0, 0, 100, 0
 	gppwm4_offBelowDuty				= scalar, U08,	4413,	"%", 1, 0, 0, 100, 0
 	gppwm4_loadAxis				 = bits, U08, 4414, [0:1], "TPS", "MAP", "CLT", "IAT"
-;no TS info - skipping gppwm4_alignmentFill offset 4415
+	gppwm4_alignmentFill_map		= scalar, U08,	4415,	"unit", 1, 0, 0, 100, 0
 	gppwm4_loadBins					= array, U08,	4416,	[8],	"load", 1, 0, 0.0, 250, 0
 	gppwm4_rpmBins					= array, U08,	4424,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
 	gppwm4_table				 = array, U08, 4432, [8x8], "duty", 1, 0, 0, 100, 0
@@ -1106,7 +1106,7 @@ page = 1
 	mc33_t_bypass					= scalar, U16,	4508,	"X", 1, 0.0, 0, 64000, 0
 	mc33_t_hold_off					= scalar, U16,	4510,	"X", 1, 0.0, 0, 64000, 0
 	mc33_t_hold_tot					= scalar, U16,	4512,	"X", 1, 0.0, 0, 64000, 0
-;no TS info - skipping alignmentFill_at_4514 offset 4514
+	alignmentFill_at_4514			= array, U08,	4514,	[2],	"units", 1, 0, -20, 100, 0
 	mainUnusedEnd					= array, S32,	4516,	[371],	"units", 1, 0, -20, 100, 0
 	warning_message				 = string, ASCII, 6000, 120
 	afterstartCoolantBins			= array, F32,	6120,	[8],	"C", 1, 0, -100.0, 250.0, 0
diff --git a/firmware/tunerstudio/rusefi_proteus.ini b/firmware/tunerstudio/rusefi_proteus.ini
index bc943a75cc..bccdb89150 100644
--- a/firmware/tunerstudio/rusefi_proteus.ini
+++ b/firmware/tunerstudio/rusefi_proteus.ini
@@ -46,12 +46,12 @@ enable2ndByteCanID = false
 
 [MegaTune]
  ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
- 	signature    = "rusEFI 2020.06.30.pro.391530368" 
+ 	signature    = "rusEFI 2020.07.01.pro.582909818" 
 
 [TunerStudio]
    queryCommand   = "S"
    versionInfo    = "V"  ; firmwave version for title bar.
-   signature    = "rusEFI 2020.06.30.pro.391530368" ; signature is expected to be 7 or more characters.
+   signature    = "rusEFI 2020.07.01.pro.582909818" ; signature is expected to be 7 or more characters.
 
 [Constants]
 ; new packet serial format with CRC
@@ -89,7 +89,7 @@ enable2ndByteCanID = false
 
 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 30 19:19:35 UTC 2020
+; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 01 01:01:15 UTC 2020
 
 pageSize            = 20000
 page = 1
@@ -136,7 +136,7 @@ page = 1
 	tpsErrorDetectionTooHigh		= scalar, S16,	86,	"%", 1, 0, 100, 110, 0
 	cranking_baseFuel				= scalar, F32,	88,	"ms", 1, 0, 0, 200, 1
 	cranking_rpm					= scalar, S16,	92,	"RPM", 1, 0, 0, 3000, 0
-;no TS info - skipping cranking_alignmentFill_at_6 offset 94
+	cranking_alignmentFill_at_6		= array, U08,	94,	[2],	"units", 1, 0, -20, 100, 0
 	primingSquirtDurationMs			= scalar, F32,	96,	"*C", 1, 0, -40, 200, 1
 	ignitionDwellForCrankingMs		= scalar, F32,	100,	"ms", 1, 0, 0, 200, 1
 	crankingChargeAngle				= scalar, F32,	104,	"deg", 1, 0, 0, 3000.0, 0
@@ -148,7 +148,7 @@ page = 1
 	map_sensor_highValue			= scalar, F32,	240,	"kpa", 1, 0, -400, 800, 2
 	map_sensor_type				 = bits, U32, 244, [0:3] "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "type12", "type13", "INVALID", "INVALID"
 	map_sensor_hwChannel		 = bits, U08, 248, [0:4] "Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2","NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-;no TS info - skipping map_sensor_alignmentFill offset 249
+	map_sensor_alignmentFill		= array, U08,	249,	[3],	"unit", 1, 0, 0, 100, 0
 	clt_tempC_1						= scalar, F32,	252,	"*C", 1, 0, -40, 200, 1
 	clt_tempC_2						= scalar, F32,	256,	"*C", 1, 0, -40, 200, 1
 	clt_tempC_3						= scalar, F32,	260,	"*C", 1, 0, -40, 200, 1
@@ -157,7 +157,7 @@ page = 1
 	clt_resistance_3				= scalar, F32,	272,	"Ohm", 1, 0, 0, 200000, 1
 	clt_bias_resistor				= scalar, F32,	276,	"Ohm", 1, 0, 0, 200000, 1
 	clt_adcChannel				 = bits, U08, 280, [0:4] "Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2","NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-;no TS info - skipping clt_alignmentFill_at_29 offset 281
+	clt_alignmentFill_at_29			= array, U08,	281,	[3],	"units", 1, 0, -20, 100, 0
 	iat_tempC_1						= scalar, F32,	284,	"*C", 1, 0, -40, 200, 1
 	iat_tempC_2						= scalar, F32,	288,	"*C", 1, 0, -40, 200, 1
 	iat_tempC_3						= scalar, F32,	292,	"*C", 1, 0, -40, 200, 1
@@ -166,7 +166,7 @@ page = 1
 	iat_resistance_3				= scalar, F32,	304,	"Ohm", 1, 0, 0, 200000, 1
 	iat_bias_resistor				= scalar, F32,	308,	"Ohm", 1, 0, 0, 200000, 1
 	iat_adcChannel				 = bits, U08, 312, [0:4] "Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2","NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-;no TS info - skipping iat_alignmentFill_at_29 offset 313
+	iat_alignmentFill_at_29			= array, U08,	313,	[3],	"units", 1, 0, -20, 100, 0
 	launchRpm						= scalar, S32,	316,	"rpm", 1, 0, 0, 20000.0, 2
 	launchTimingRetard				= scalar, S32,	320,	"deg", 1, 0, -180, 180, 2
 	hip9011PrescalerAndSDO			= scalar, S32,	324,	"integer", 1, 0.0, 0.0, 32, 0
@@ -255,7 +255,7 @@ page = 1
 	camInputs3					 = bits, U08, 558, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Digital 1","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","VR 1","VR 2","INVALID","INVALID","Digital 2","Digital 3","Digital 4","Digital 5","Digital 6","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 	camInputs4					 = bits, U08, 559, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Digital 1","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","VR 1","VR 2","INVALID","INVALID","Digital 2","Digital 3","Digital 4","Digital 5","Digital 6","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 	afr_hwChannel				 = bits, U08, 560, [0:4] "Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2","NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-;no TS info - skipping afr_alignmentFill_afr offset 561
+	afr_alignmentFill_afr			= array, U08,	561,	[3],	"unit", 1, 0, 0, 100, 0
 	afr_v1							= scalar, F32,	564,	 "volts", 1, 0.0, 0, 10.0, 2
 	afr_value1						= scalar, F32,	568,	 "AFR", 1, 0.0, 0, 1000.0, 2
 	afr_v2							= scalar, F32,	572,	 "volts", 1, 0.0, 0, 10.0, 2
@@ -268,7 +268,7 @@ page = 1
 	baroSensor_highValue			= scalar, F32,	588,	"kpa", 1, 0, -400, 800, 2
 	baroSensor_type				 = bits, U32, 592, [0:3] "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "3 Bar", "MPX4100", "Toyota 89420-02010", "MPX4250A", "Bosch 2.5", "Mazda1Bar", "type12", "type13", "INVALID", "INVALID"
 	baroSensor_hwChannel		 = bits, U08, 596, [0:4] "Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2","NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-;no TS info - skipping baroSensor_alignmentFill offset 597
+	baroSensor_alignmentFill		= array, U08,	597,	[3],	"unit", 1, 0, 0, 100, 0
 	idle_solenoidFrequency			= scalar, S32,	600,	"Hz", 1, 0, 0, 3000, 0
 	idle_solenoidPin			 = bits, U08, 604, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Highside 2","Highside 1","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Lowside 8","Lowside 9","Lowside 10","Lowside 11","Lowside 12","Lowside 13","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Ign 5","Ign 4","Ign 3","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Ign 2","Ign 1","INVALID","INVALID","Lowside 1","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Highside 4","Highside 3","Lowside 14","Lowside 15","Lowside 16","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Ign 12","Ign 11","Ign 10","Ign 9","Ign 8","Ign 7","Ign 6","Lowside 2","Lowside 3","Lowside 4","Lowside 5","Lowside 6","Lowside 7","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
 	idle_stepperDirectionPin	 = bits, U08, 605, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@@ -833,7 +833,7 @@ page = 1
 	throttlePedalSecondaryUpVoltage		= scalar, F32,	2100,	"voltage", 1, 0, -6, 6, 2
 	throttlePedalSecondaryWOTVoltage		= scalar, F32,	2104,	"voltage", 1, 0, -6, 6, 2
 	canBaudRate					 = bits, U08, 2108, [0:1], "100kbps", "250kbps" , "500kbps", "1Mbps"
-;no TS info - skipping alignmentFill_at_2109 offset 2109
+	alignmentFill_at_2109			= array, U08,	2109,	[3],	"units", 1, 0, -20, 100, 0
 	unused_former_warmup_target_afr		= array, U32,	2112,	[5],	"units", 1, 0, -20, 100, 0
 	boostCutPressure				= scalar, F32,	2132,	"kPa", 1, 0, 0, 500, 0
 	mapAccelTaperBins				= array, F32,	2136,	[8],	"counter", 1, 0, 0.0, 300, 0
@@ -887,7 +887,7 @@ page = 1
 	auxTempSensor1_resistance_3		= scalar, F32,	2464,	"Ohm", 1, 0, 0, 200000, 1
 	auxTempSensor1_bias_resistor		= scalar, F32,	2468,	"Ohm", 1, 0, 0, 200000, 1
 	auxTempSensor1_adcChannel	 = bits, U08, 2472, [0:4] "Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2","NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-;no TS info - skipping auxTempSensor1_alignmentFill_at_29 offset 2473
+	auxTempSensor1_alignmentFill_at_29		= array, U08,	2473,	[3],	"units", 1, 0, -20, 100, 0
 	auxTempSensor2_tempC_1			= scalar, F32,	2476,	"*C", 1, 0, -40, 200, 1
 	auxTempSensor2_tempC_2			= scalar, F32,	2480,	"*C", 1, 0, -40, 200, 1
 	auxTempSensor2_tempC_3			= scalar, F32,	2484,	"*C", 1, 0, -40, 200, 1
@@ -896,7 +896,7 @@ page = 1
 	auxTempSensor2_resistance_3		= scalar, F32,	2496,	"Ohm", 1, 0, 0, 200000, 1
 	auxTempSensor2_bias_resistor		= scalar, F32,	2500,	"Ohm", 1, 0, 0, 200000, 1
 	auxTempSensor2_adcChannel	 = bits, U08, 2504, [0:4] "Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2","NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-;no TS info - skipping auxTempSensor2_alignmentFill_at_29 offset 2505
+	auxTempSensor2_alignmentFill_at_29		= array, U08,	2505,	[3],	"units", 1, 0, -20, 100, 0
 	unused2508						= array, U08,	2508,	[6],	"units", 1, 0, -20, 100, 0
 	etbFreq							= scalar, S16,	2514,	"Hz", 1, 0, 0, 30000, 0
 	unused2516						= array, U08,	2516,	[24],	"units", 1, 0, -20, 100, 0
@@ -960,7 +960,7 @@ page = 1
 	auxPid4_minValue				= scalar, S16,	2688,	"", 1, 0, -30000, 30000.0, 0
 	auxPid4_maxValue				= scalar, S16,	2690,	"", 1, 0, -30000, 30000.0, 0
 	oilPressure_hwChannel		 = bits, U08, 2692, [0:4] "Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2","NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
-;no TS info - skipping oilPressure_alignmentFill offset 2693
+	oilPressure_alignmentFill		= array, U08,	2693,	[3],	"unit", 1, 0, 0, 100, 0
 	oilPressure_v1					= scalar, F32,	2696,	 "volts", 1, 0.0, 0, 10.0, 2
 	oilPressure_value1				= scalar, F32,	2700,	 "kPa", 1, 0.0, 0, 1000.0, 2
 	oilPressure_v2					= scalar, F32,	2704,	 "volts", 1, 0.0, 0, 10.0, 2
@@ -1063,7 +1063,7 @@ page = 1
 	gppwm1_onAboveDuty				= scalar, U08,	4148,	"%", 1, 0, 0, 100, 0
 	gppwm1_offBelowDuty				= scalar, U08,	4149,	"%", 1, 0, 0, 100, 0
 	gppwm1_loadAxis				 = bits, U08, 4150, [0:1], "TPS", "MAP", "CLT", "IAT"
-;no TS info - skipping gppwm1_alignmentFill offset 4151
+	gppwm1_alignmentFill_map		= scalar, U08,	4151,	"unit", 1, 0, 0, 100, 0
 	gppwm1_loadBins					= array, U08,	4152,	[8],	"load", 1, 0, 0.0, 250, 0
 	gppwm1_rpmBins					= array, U08,	4160,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
 	gppwm1_table				 = array, U08, 4168, [8x8], "duty", 1, 0, 0, 100, 0
@@ -1073,7 +1073,7 @@ page = 1
 	gppwm2_onAboveDuty				= scalar, U08,	4236,	"%", 1, 0, 0, 100, 0
 	gppwm2_offBelowDuty				= scalar, U08,	4237,	"%", 1, 0, 0, 100, 0
 	gppwm2_loadAxis				 = bits, U08, 4238, [0:1], "TPS", "MAP", "CLT", "IAT"
-;no TS info - skipping gppwm2_alignmentFill offset 4239
+	gppwm2_alignmentFill_map		= scalar, U08,	4239,	"unit", 1, 0, 0, 100, 0
 	gppwm2_loadBins					= array, U08,	4240,	[8],	"load", 1, 0, 0.0, 250, 0
 	gppwm2_rpmBins					= array, U08,	4248,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
 	gppwm2_table				 = array, U08, 4256, [8x8], "duty", 1, 0, 0, 100, 0
@@ -1083,7 +1083,7 @@ page = 1
 	gppwm3_onAboveDuty				= scalar, U08,	4324,	"%", 1, 0, 0, 100, 0
 	gppwm3_offBelowDuty				= scalar, U08,	4325,	"%", 1, 0, 0, 100, 0
 	gppwm3_loadAxis				 = bits, U08, 4326, [0:1], "TPS", "MAP", "CLT", "IAT"
-;no TS info - skipping gppwm3_alignmentFill offset 4327
+	gppwm3_alignmentFill_map		= scalar, U08,	4327,	"unit", 1, 0, 0, 100, 0
 	gppwm3_loadBins					= array, U08,	4328,	[8],	"load", 1, 0, 0.0, 250, 0
 	gppwm3_rpmBins					= array, U08,	4336,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
 	gppwm3_table				 = array, U08, 4344, [8x8], "duty", 1, 0, 0, 100, 0
@@ -1093,7 +1093,7 @@ page = 1
 	gppwm4_onAboveDuty				= scalar, U08,	4412,	"%", 1, 0, 0, 100, 0
 	gppwm4_offBelowDuty				= scalar, U08,	4413,	"%", 1, 0, 0, 100, 0
 	gppwm4_loadAxis				 = bits, U08, 4414, [0:1], "TPS", "MAP", "CLT", "IAT"
-;no TS info - skipping gppwm4_alignmentFill offset 4415
+	gppwm4_alignmentFill_map		= scalar, U08,	4415,	"unit", 1, 0, 0, 100, 0
 	gppwm4_loadBins					= array, U08,	4416,	[8],	"load", 1, 0, 0.0, 250, 0
 	gppwm4_rpmBins					= array, U08,	4424,	[8],	"RPM", 50, 0, 0.0, 12000.0, 0
 	gppwm4_table				 = array, U08, 4432, [8x8], "duty", 1, 0, 0, 100, 0
@@ -1106,7 +1106,7 @@ page = 1
 	mc33_t_bypass					= scalar, U16,	4508,	"X", 1, 0.0, 0, 64000, 0
 	mc33_t_hold_off					= scalar, U16,	4510,	"X", 1, 0.0, 0, 64000, 0
 	mc33_t_hold_tot					= scalar, U16,	4512,	"X", 1, 0.0, 0, 64000, 0
-;no TS info - skipping alignmentFill_at_4514 offset 4514
+	alignmentFill_at_4514			= array, U08,	4514,	[2],	"units", 1, 0, -20, 100, 0
 	mainUnusedEnd					= array, S32,	4516,	[371],	"units", 1, 0, -20, 100, 0
 	warning_message				 = string, ASCII, 6000, 120
 	afterstartCoolantBins			= array, F32,	6120,	[8],	"C", 1, 0, -100.0, 250.0, 0
diff --git a/java_console/models/src/com/rusefi/config/generated/Fields.java b/java_console/models/src/com/rusefi/config/generated/Fields.java
index ca70e220cc..b69c94a540 100644
--- a/java_console/models/src/com/rusefi/config/generated/Fields.java
+++ b/java_console/models/src/com/rusefi/config/generated/Fields.java
@@ -1,6 +1,6 @@
 package com.rusefi.config.generated;
 
-// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 30 19:19:29 UTC 2020
+// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jul 01 01:01:09 UTC 2020
 
 // by class com.rusefi.output.FileJavaFieldsConsumer
 import com.rusefi.config.*;
@@ -321,6 +321,7 @@ public class Fields {
 	public static final int ET_FRANKENSO_MIATA_NA6 = 41;
 	public static final int ET_FRANKENSO_MIATA_NA6_VAF = 57;
 	public static final int ET_FRANKENSO_MIATA_NB2 = 47;
+	public static final int ET_MRE_DEFAULTS = 60;
 	public static final int ET_MRE_MIATA_NA6 = 12;
 	public static final int ET_MRE_MIATA_NB2_MAF = 15;
 	public static final int ET_MRE_MIATA_NB2_MAP = 11;
@@ -601,7 +602,7 @@ public class Fields {
 	public static final int gpioPinModes7_offset = 770;
 	public static final int gpioPinModes8_offset = 771;
 	public static final int gpioPinModes9_offset = 772;
-	public static final int gppwm1_alignmentFill_offset = 4151;
+	public static final int gppwm1_alignmentFill_map_offset = 4151;
 	public static final int gppwm1_dutyIfError_offset = 4145;
 	public static final int gppwm1_loadAxis_offset = 4150;
 	public static final int gppwm1_loadBins_offset = 4152;
@@ -612,7 +613,7 @@ public class Fields {
 	public static final int gppwm1_pwmFrequency_offset = 4146;
 	public static final int gppwm1_rpmBins_offset = 4160;
 	public static final int gppwm1_table_offset = 4168;
-	public static final int gppwm2_alignmentFill_offset = 4239;
+	public static final int gppwm2_alignmentFill_map_offset = 4239;
 	public static final int gppwm2_dutyIfError_offset = 4233;
 	public static final int gppwm2_loadAxis_offset = 4238;
 	public static final int gppwm2_loadBins_offset = 4240;
@@ -623,7 +624,7 @@ public class Fields {
 	public static final int gppwm2_pwmFrequency_offset = 4234;
 	public static final int gppwm2_rpmBins_offset = 4248;
 	public static final int gppwm2_table_offset = 4256;
-	public static final int gppwm3_alignmentFill_offset = 4327;
+	public static final int gppwm3_alignmentFill_map_offset = 4327;
 	public static final int gppwm3_dutyIfError_offset = 4321;
 	public static final int gppwm3_loadAxis_offset = 4326;
 	public static final int gppwm3_loadBins_offset = 4328;
@@ -634,7 +635,7 @@ public class Fields {
 	public static final int gppwm3_pwmFrequency_offset = 4322;
 	public static final int gppwm3_rpmBins_offset = 4336;
 	public static final int gppwm3_table_offset = 4344;
-	public static final int gppwm4_alignmentFill_offset = 4415;
+	public static final int gppwm4_alignmentFill_map_offset = 4415;
 	public static final int gppwm4_dutyIfError_offset = 4409;
 	public static final int gppwm4_loadAxis_offset = 4414;
 	public static final int gppwm4_loadBins_offset = 4416;
@@ -1039,7 +1040,7 @@ public class Fields {
 	public static final int servoOutputPins8_offset = 3147;
 	public static final int showHumanReadableWarning_offset = 976;
 	public static final int showSdCardWarning_offset = 76;
-	public static final int SIGNATURE_HASH = 309701893;
+	public static final int SIGNATURE_HASH = 129680412;
 	public static final int silentTriggerError_offset = 1464;
 	public static final int slowAdcAlpha_offset = 2088;
 	public static final int sparkDwellRpmBins_offset = 332;
@@ -1278,7 +1279,7 @@ public class Fields {
 	public static final int TS_RESPONSE_COMMAND_OK = 7;
 	public static final int TS_RESPONSE_OK = 0;
 	public static final char TS_SET_LOGGER_SWITCH = 'l';
-	public static final String TS_SIGNATURE = "rusEFI 2020.06.30.all.309701893";
+	public static final String TS_SIGNATURE = "rusEFI 2020.07.01.all.129680412";
 	public static final char TS_SINGLE_WRITE_COMMAND = 'W';
 	public static final int tunerStudioSerialSpeed_offset = 728;
 	public static final int twoWireBatchIgnition_offset = 1476;
@@ -2333,7 +2334,7 @@ public class Fields {
 	public static final Field GPPWM1_OFFBELOWDUTY = Field.create("GPPWM1_OFFBELOWDUTY", 4149, FieldType.INT8);
 	public static final String[] gppwm_channel_e = {"TPS", "MAP", "CLT", "IAT"};
 	public static final Field GPPWM1_LOADAXIS = Field.create("GPPWM1_LOADAXIS", 4150, FieldType.INT8, gppwm_channel_e);
-	public static final Field GPPWM1_ALIGNMENTFILL = Field.create("GPPWM1_ALIGNMENTFILL", 4151, FieldType.INT8);
+	public static final Field GPPWM1_ALIGNMENTFILL_MAP = Field.create("GPPWM1_ALIGNMENTFILL_MAP", 4151, FieldType.INT8);
 	public static final Field GPPWM1_TABLE = Field.create("GPPWM1_TABLE", 4168, FieldType.INT);
 	public static final Field GPPWM2_PIN = Field.create("GPPWM2_PIN", 4232, FieldType.INT8, output_pin_e);
 	public static final Field GPPWM2_DUTYIFERROR = Field.create("GPPWM2_DUTYIFERROR", 4233, FieldType.INT8);
@@ -2341,7 +2342,7 @@ public class Fields {
 	public static final Field GPPWM2_ONABOVEDUTY = Field.create("GPPWM2_ONABOVEDUTY", 4236, FieldType.INT8);
 	public static final Field GPPWM2_OFFBELOWDUTY = Field.create("GPPWM2_OFFBELOWDUTY", 4237, FieldType.INT8);
 	public static final Field GPPWM2_LOADAXIS = Field.create("GPPWM2_LOADAXIS", 4238, FieldType.INT8, gppwm_channel_e);
-	public static final Field GPPWM2_ALIGNMENTFILL = Field.create("GPPWM2_ALIGNMENTFILL", 4239, FieldType.INT8);
+	public static final Field GPPWM2_ALIGNMENTFILL_MAP = Field.create("GPPWM2_ALIGNMENTFILL_MAP", 4239, FieldType.INT8);
 	public static final Field GPPWM2_TABLE = Field.create("GPPWM2_TABLE", 4256, FieldType.INT);
 	public static final Field GPPWM3_PIN = Field.create("GPPWM3_PIN", 4320, FieldType.INT8, output_pin_e);
 	public static final Field GPPWM3_DUTYIFERROR = Field.create("GPPWM3_DUTYIFERROR", 4321, FieldType.INT8);
@@ -2349,7 +2350,7 @@ public class Fields {
 	public static final Field GPPWM3_ONABOVEDUTY = Field.create("GPPWM3_ONABOVEDUTY", 4324, FieldType.INT8);
 	public static final Field GPPWM3_OFFBELOWDUTY = Field.create("GPPWM3_OFFBELOWDUTY", 4325, FieldType.INT8);
 	public static final Field GPPWM3_LOADAXIS = Field.create("GPPWM3_LOADAXIS", 4326, FieldType.INT8, gppwm_channel_e);
-	public static final Field GPPWM3_ALIGNMENTFILL = Field.create("GPPWM3_ALIGNMENTFILL", 4327, FieldType.INT8);
+	public static final Field GPPWM3_ALIGNMENTFILL_MAP = Field.create("GPPWM3_ALIGNMENTFILL_MAP", 4327, FieldType.INT8);
 	public static final Field GPPWM3_TABLE = Field.create("GPPWM3_TABLE", 4344, FieldType.INT);
 	public static final Field GPPWM4_PIN = Field.create("GPPWM4_PIN", 4408, FieldType.INT8, output_pin_e);
 	public static final Field GPPWM4_DUTYIFERROR = Field.create("GPPWM4_DUTYIFERROR", 4409, FieldType.INT8);
@@ -2357,7 +2358,7 @@ public class Fields {
 	public static final Field GPPWM4_ONABOVEDUTY = Field.create("GPPWM4_ONABOVEDUTY", 4412, FieldType.INT8);
 	public static final Field GPPWM4_OFFBELOWDUTY = Field.create("GPPWM4_OFFBELOWDUTY", 4413, FieldType.INT8);
 	public static final Field GPPWM4_LOADAXIS = Field.create("GPPWM4_LOADAXIS", 4414, FieldType.INT8, gppwm_channel_e);
-	public static final Field GPPWM4_ALIGNMENTFILL = Field.create("GPPWM4_ALIGNMENTFILL", 4415, FieldType.INT8);
+	public static final Field GPPWM4_ALIGNMENTFILL_MAP = Field.create("GPPWM4_ALIGNMENTFILL_MAP", 4415, FieldType.INT8);
 	public static final Field GPPWM4_TABLE = Field.create("GPPWM4_TABLE", 4432, FieldType.INT);
 	public static final Field MC33_I_BOOST = Field.create("MC33_I_BOOST", 4496, FieldType.INT16);
 	public static final Field MC33_I_PEAK = Field.create("MC33_I_PEAK", 4498, FieldType.INT16);
@@ -3310,7 +3311,7 @@ public class Fields {
 	GPPWM1_ONABOVEDUTY,
 	GPPWM1_OFFBELOWDUTY,
 	GPPWM1_LOADAXIS,
-	GPPWM1_ALIGNMENTFILL,
+	GPPWM1_ALIGNMENTFILL_MAP,
 	GPPWM1_TABLE,
 	GPPWM2_PIN,
 	GPPWM2_DUTYIFERROR,
@@ -3318,7 +3319,7 @@ public class Fields {
 	GPPWM2_ONABOVEDUTY,
 	GPPWM2_OFFBELOWDUTY,
 	GPPWM2_LOADAXIS,
-	GPPWM2_ALIGNMENTFILL,
+	GPPWM2_ALIGNMENTFILL_MAP,
 	GPPWM2_TABLE,
 	GPPWM3_PIN,
 	GPPWM3_DUTYIFERROR,
@@ -3326,7 +3327,7 @@ public class Fields {
 	GPPWM3_ONABOVEDUTY,
 	GPPWM3_OFFBELOWDUTY,
 	GPPWM3_LOADAXIS,
-	GPPWM3_ALIGNMENTFILL,
+	GPPWM3_ALIGNMENTFILL_MAP,
 	GPPWM3_TABLE,
 	GPPWM4_PIN,
 	GPPWM4_DUTYIFERROR,
@@ -3334,7 +3335,7 @@ public class Fields {
 	GPPWM4_ONABOVEDUTY,
 	GPPWM4_OFFBELOWDUTY,
 	GPPWM4_LOADAXIS,
-	GPPWM4_ALIGNMENTFILL,
+	GPPWM4_ALIGNMENTFILL_MAP,
 	GPPWM4_TABLE,
 	MC33_I_BOOST,
 	MC33_I_PEAK,
diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml
index a49d725ba3..b424117d2e 100644
--- a/java_console/rusefi.xml
+++ b/java_console/rusefi.xml
@@ -1,6 +1,6 @@
 <roms>
 
-<!-- was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh Tue Jun 30 19:19:31 UTC 2020 -->
+<!-- was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh Wed Jul 01 01:01:10 UTC 2020 -->
 
     <rom>
         <romid>