diff --git a/firmware/controllers/algo/engine_configuration.h b/firmware/controllers/algo/engine_configuration.h
index 95611ec32c..36ef2c7161 100644
--- a/firmware/controllers/algo/engine_configuration.h
+++ b/firmware/controllers/algo/engine_configuration.h
@@ -61,6 +61,8 @@ typedef enum {
 	 * You would use this value if you want to see a detailed graph of your trigger events
 	 */
 	AC_TRIGGER = 1, AC_MAP = 2,
+
+	Internal_ForceMyEnumIntSize_analog_chart = ENUM_32_BITS,
 } analog_chart_e;
 
 typedef enum {
@@ -273,7 +275,7 @@ typedef struct {
 	// offset 6248
 	brain_pin_e joystickDPin;
 	// offset 6252
-	uint32_t analogChartMode;
+	analog_chart_e analogChartMode;
 	int unusedbs[6];
 
 	le_formula_t le_formulas[LE_COMMAND_COUNT];
@@ -384,16 +386,31 @@ typedef struct {
 	*/
 	MAP_sensor_config_s map;
 
-	// todo: merge with channel settings, use full-scale Thermistor here!
-	ThermistorConf cltThermistorConf; // size 40 (10*4), offset 336
-	ThermistorConf iatThermistorConf; // size 40, offset 376
-
-	float sparkDwellBins[DWELL_COUNT]; // offset 580
+	/**
+	 * todo: merge with channel settings, use full-scale Thermistor here!
+	 * offset 500
+	*/
+	ThermistorConf cltThermistorConf;
+	/**
+	 * offset 540
+	*/
+	ThermistorConf iatThermistorConf;
+	/**
+	 * offset 580
+	*/
+	float sparkDwellBins[DWELL_COUNT];
+	/**
+	 * offset 612
+	*/
 	float sparkDwell[DWELL_COUNT];
-
+	/**
+	 * offset 644
+	*/
 	float ignitionLoadBins[IGN_LOAD_COUNT];
+	/**
+	 * offset 708
+	*/
 	float ignitionRpmBins[IGN_RPM_COUNT];
-
 	/**
 	 * this value could be used to offset the whole ignition timing table by a constant
 	 * offset 772
diff --git a/firmware/rusefi_config.ini b/firmware/rusefi_config.ini
index 818bc6a2ef..ad2d2b3487 100644
--- a/firmware/rusefi_config.ini
+++ b/firmware/rusefi_config.ini
@@ -8,6 +8,11 @@
 ! type name;comment
 
 
+! all the sub-structures are going to be nested withint the primary structure, that's
+! needed to get a proper TunerStudio file
+struct engine_configuration_s
+
+
 struct cranking_parameters_s
 float baseCrankingFuel;
 int16_t crankingRpm;This value controls what RPM values we consider 'cranking' (any RPM below 'crankingRpm')\nAnything above 'crankingRpm' would be 'running'
@@ -52,7 +57,6 @@ end_struct
 
 
 
-struct engine_configuration_s
 
 
 bits engine_type_e S32   [0:2], "AUDI_AAN", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "FORD_FIESTA", "NISSAN_PRIMERA", "HONDA_ACCORD", "FORD_INLINE_6_1995", "GY6_139QMB"
@@ -81,8 +85,8 @@ int16_t directSelfStimulation;Should the trigger emulator push data right into t
 int16_t tpsMin;todo: extract these two fields into a structure\ntodo: we need two sets of TPS parameters - modern ETBs have to sensors;"ADC",      1,     0,    0, 1023,      0
 int16_t tpsMax;tpsMax value as 10 bit ADC value. Not Voltage!;"ADC",      1,     0,    0, 1023,      0
 
-bits analog_chart_e S16         [0:1], "none", "trigger", "MAP", "INVALID"		
-analog_chart_e analogChartMode;
+uint16_t unused334;
+
 
 int16_t tpsErrorLowValue;todo: finish implementation. These values are used for TPS disconnect detection
 int16_t tpsErrorHighValue
@@ -95,7 +99,7 @@ MAP_sensor_config_s map;@see hasMapSensor\n@see isMapAveragingEnabled
 
 
 ThermistorConf cltThermistorConf;todo: merge with channel settings, use full-scale Thermistor here!
-               ThermistorConf iatThermistorConf;
+ThermistorConf iatThermistorConf;
 
 #define DWELL_COUNT 8
 
@@ -118,4 +122,15 @@ float crankingChargeAngle;While cranking (which causes battery voltage to drop)
 
 timing_mode_e timingMode;
 
+
+
+
+
+
+
+
+
+bits analog_chart_e S32         [0:1], "none", "trigger", "MAP", "INVALID"		
+analog_chart_e analogChartMode;
+
 end_struct
\ No newline at end of file