diff --git a/firmware/console/status_loop.cpp b/firmware/console/status_loop.cpp
index 93ab1f8e1e..35724bb82a 100644
--- a/firmware/console/status_loop.cpp
+++ b/firmware/console/status_loop.cpp
@@ -306,7 +306,7 @@ void updateDevConsoleState(Engine *engine) {
  */
 
 static void showFuelInfo2(float rpm, float engineLoad) {
-	float baseFuel = getBaseTableFuel(engineConfiguration, (int) rpm, engineLoad);
+	float baseFuelMs = getBaseTableFuel(engineConfiguration, (int) rpm, engineLoad);
 
 	scheduleMsg(&logger2, "algo=%s/pump=%s", getEngine_load_mode_e(engineConfiguration->algorithm), boolToString(getOutputPinValue(FUEL_PUMP_RELAY)));
 
@@ -317,12 +317,12 @@ static void showFuelInfo2(float rpm, float engineLoad) {
 		float cltCorrection = getCltCorrection(engineConfiguration, getCoolantTemperature(engineConfiguration2));
 		float injectorLag = getInjectorLag(engineConfiguration, getVBatt());
 		scheduleMsg(&logger2, "rpm=%f engineLoad=%f", rpm, engineLoad);
-		scheduleMsg(&logger2, "baseFuel=%f", baseFuel);
+		scheduleMsg(&logger2, "baseFuel=%f", baseFuelMs);
 
 		scheduleMsg(&logger2, "iatCorrection=%f cltCorrection=%f injectorLag=%f", iatCorrection, cltCorrection,
 				injectorLag);
 
-		float value = getRunningFuel(baseFuel, &engine, (int) rpm);
+		float value = getRunningFuel(baseFuelMs, &engine, (int) rpm);
 		scheduleMsg(&logger2, "injection pulse width: %f", value);
 	}
 }
@@ -361,7 +361,7 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels) {
 	float intake = getIntakeAirTemperature(engineConfiguration2);
 
 	float engineLoad = getEngineLoad();
-	float baseFuel = getBaseTableFuel(engineConfiguration, (int) rpm, engineLoad);
+	float baseFuelMs = getBaseTableFuel(engineConfiguration, (int) rpm, engineLoad);
 
 	tsOutputChannels->rpm = rpm;
 	tsOutputChannels->coolant_temperature = coolant;
@@ -393,8 +393,8 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels) {
 #endif
 	tsOutputChannels->tCharge = getTCharge(rpm, tps, coolant, intake);
 	tsOutputChannels->sparkDwell = getSparkDwellMs(rpm);
-	tsOutputChannels->pulseWidth = getRunningFuel(baseFuel, &engine, rpm);
-	tsOutputChannels->crankingFuel = getCrankingFuel(&engine);
+	tsOutputChannels->pulseWidthMs = getRunningFuel(baseFuelMs, &engine, rpm);
+	tsOutputChannels->crankingFuelMs = getCrankingFuel(&engine);
 }
 
 extern TunerStudioOutputChannels tsOutputChannels;
diff --git a/firmware/console/tunerstudio/tunerstudio_configuration.h b/firmware/console/tunerstudio/tunerstudio_configuration.h
index ca5e1a8000..2ef32f59ef 100644
--- a/firmware/console/tunerstudio/tunerstudio_configuration.h
+++ b/firmware/console/tunerstudio/tunerstudio_configuration.h
@@ -42,12 +42,12 @@ typedef struct {
 	short int alignment; // size 2, offset 34
 	float atmospherePressure; // size 4, offset 36
 	float manifold_air_pressure; // size 4, offset 40
-	float crankingFuel;
-	int tpsVolrage;
+	float crankingFuelMs;
+	int unused;
 	float tCharge; // 52
 	float inj_adv; // 56
 	float sparkDwell; // 60
-	float pulseWidth; // 64
+	float pulseWidthMs; // 64
 	float warmUpEnrich;	// 68
 	/**
 	 * Yes, I do not really enjoy packing bits into integers but we simply have too many boolean flags and I cannot
@@ -71,7 +71,7 @@ typedef struct {
 	unsigned int isIatError : 1; // bit 3
 	int tsConfigVersion;
 	egt_values_s egtValues;
-	int unused[3];
+	int unused3[3];
 } TunerStudioOutputChannels;
 
 #endif /* TUNERSTUDIO_CONFIGURATION_H_ */
diff --git a/firmware/controllers/algo/fuel_math.cpp b/firmware/controllers/algo/fuel_math.cpp
index 0232361850..10d7456b4e 100644
--- a/firmware/controllers/algo/fuel_math.cpp
+++ b/firmware/controllers/algo/fuel_math.cpp
@@ -85,8 +85,7 @@ float getFuelMs(int rpm, Engine *engine) {
 	return theoreticalInjectionLength + injectorLag;
 }
 
-// todo: start using 'engine' parameter and not 'extern'
-float getRunningFuel(float baseFuel, Engine *engine, int rpm) {
+float getRunningFuel(float baseFuelMs, Engine *engine, int rpm) {
 	engine_configuration_s *engineConfiguration = engine->engineConfiguration;
 	float iatCorrection = getIatCorrection(engineConfiguration, getIntakeAirTemperature(engine->engineConfiguration2));
 	float cltCorrection = getCltCorrection(engineConfiguration, getCoolantTemperature(engine->engineConfiguration2));
@@ -96,7 +95,7 @@ float getRunningFuel(float baseFuel, Engine *engine, int rpm) {
 	// todo: accelEnrichment
 #endif /* EFI_ACCEL_ENRICHMENT */
 
-	return baseFuel * cltCorrection * iatCorrection;
+	return baseFuelMs * cltCorrection * iatCorrection;
 }
 
 static Map3D1616 fuelMap;