diff --git a/firmware/controllers/tachometer.cpp b/firmware/controllers/tachometer.cpp
index 697e670339..7b723bb8a8 100644
--- a/firmware/controllers/tachometer.cpp
+++ b/firmware/controllers/tachometer.cpp
@@ -2,6 +2,8 @@
  * @file tachometer.cpp
  * @brief This is about driving external analog tachometers
  *
+ * todo: these is a bit of duplication with dizzySparkOutputPin
+ *
  * @date Aug 18, 2015
  * @author Andrey Belomutskiy, (c) 2012-2016
  */
diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini
index eabd997338..dceca66403 100644
--- a/firmware/tunerstudio/rusefi.ini
+++ b/firmware/tunerstudio/rusefi.ini
@@ -827,7 +827,7 @@ fileVersion = { 20160430 }
       yBins       = injector_battLagCorr
       gauge       = VBattGauge
       
-   curve = mafDecodingCurve, "MAF decoding"
+   curve = mafDecodingCurve, "MAF Sensor Settings"
       columnLabel = "Voltage", "kg/hour"
       xAxis       =  -1, 6, 10
       yAxis       = -30,  1300, 10
@@ -902,7 +902,7 @@ fileVersion = { 20160430 }
       gridOrient  = 250,   0, 340 ; Space 123 rotation of grid in degrees.
       upDownLabel = "(RICHER)", "(LEANER)"
 
-   table = tpsTpsAccelTbl,  tpsTpsAccelMap,  "TPS acceleration",   1
+   table = tpsTpsAccelTbl,  tpsTpsAccelMap,  "TPS/TPS acceleration Multiplier",   1
       xBins       = tpsTpsAccelFromRpmBins,  TPS
       yBins       = tpsTpsAccelToRpmBins,  TPS
       zBins       = tpsTpsAccelTable
@@ -937,7 +937,7 @@ fileVersion = { 20160430 }
       gridOrient  = 250,   0, 340 ; Space 123 rotation of grid in degrees.
       upDownLabel = "(RICHER)", "(LEANER)"
 
-   table = ignitionIatCorrTableTbl,  ignitionIatCorrTableMap,  "Ignition Iat Corr Table",   1
+   table = ignitionIatCorrTableTbl,  ignitionIatCorrTableMap,  "Ignition Intake Air Temp correction",   1
       ;       constant, variable
       xBins       = ignitionIatCorrRpmBins,  rpm
       yBins       = ignitionIatCorrLoadBins,  intake
@@ -956,7 +956,7 @@ fileVersion = { 20160430 }
       upDownLabel = "(RICHER)", "(LEANER)"
 
 
-   table = injPhaseTableTbl,  injPhaseTableMap,  "Injection Phase Table",   1
+   table = injPhaseTableTbl,  injPhaseTableMap,  "Injection Phase",   1
       ;       constant, variable
       xBins       = injPhaseRpmBins,  rpm
       yBins       = injPhaseLoadBins,  engineLoad
@@ -1166,6 +1166,7 @@ fileVersion = { 20160430 }
 		subMenu = injectionSettings,		"Injection Settings"
 		subMenu = ignitionSettings,			"Ignition Settings"
 		subMenu = std_separator
+		subMenu = analogInputs,				"Analog inputs"
 		subMenu = cltSensor,				"CLT Sensor Settings"
 		subMenu = iatSensor,				"IAT Sensor Settings"
 		subMenu = mapSettings,				"MAP Sensor Settings"
@@ -1174,8 +1175,7 @@ fileVersion = { 20160430 }
 		subMenu = egtInputs,				"EGT inputs"
 		subMenu = energySystems,			"Battery and Alternator Settings"
 		subMenu = speedSensor,				"Speed Sensor Settings"
-		subMenu = tachSettings,		"Tach output"
-		subMenu = analogInputs,				"Other inputs"
+		subMenu = tachSettings,				"Tachometer output"
 		subMenu = std_separator
 		subMenu = fanSetting,				"Fan Settings"
 		subMenu = idleSettings,				"Idle Settings"
@@ -1186,7 +1186,7 @@ fileVersion = { 20160430 }
 		subMenu = spiFunction,				"SPI Settings"
 	menu = "Tuning"
 		subMenu = generalSettings,			"General"
-		subMenu = monitoringSettings,		"Console Monitoring"
+		subMenu = monitoringSettings,		"rusEfi Console Settings"
 		subMenu = std_separator
 		subMenu = crankingDialog,           "Cranking"
 		subMenu = crankingCltCurve,	    	"Cranking Coolant Temp Multiplier"
@@ -1598,12 +1598,14 @@ cmd_test_idle_valve          = "w\x00\x17\x00\x01"
 	dialog = analogInputs, "Analog inputs"
 		field = "!ECU reboot needed to apply these settings"
 		field = "TPS ADC input", 						tpsAdcChannel
+		field = "!todo: move MAF channel to maf curve dialog"
 		field = "MAF ADC input", 						mafAdcChannel
 		field = "Baro ADC input", 						baroSensor_hwChannel
 		field = "Analog divider",						analogInputDividerCoefficient
 		field = "Smoothing factor",						slowAdcAlpha		
 
-	dialog = tachSettings, "Analog tachometer output"
+	dialog = tachSettings, "Tachometer output"
+		field = "!See also dizzySparkOutputPin"
 		field = "pin",									tachOutputPin
 		field = "pin mode",								tachOutputPinMode
 		field = "rise at trigger index",				tachPulseTriggerIndex
@@ -1654,8 +1656,8 @@ cmd_test_idle_valve          = "w\x00\x17\x00\x01"
 		panel = lcdScreen,		East
 		panel = connectRight,	West
 				
-	dialog = monitoringSettings, "Monitoring Settings"			
-		field = "Sensor chart",         	    		sensorChartMode
+	dialog = monitoringSettings, "rusEfi Console Settings"			
+		field = "Sensor Sniffer",         	    		sensorChartMode
 		field = "  Threshold",							sensorSnifferRpmThreshold
 		field = "  Each X cycle",						sensorChartFrequency
 		field = "Engine Sniffer", 						isEngineChartEnabled			
diff --git a/firmware/util/efilib.h b/firmware/util/efilib.h
index 8ca08c00a6..e49894d2f7 100644
--- a/firmware/util/efilib.h
+++ b/firmware/util/efilib.h
@@ -43,17 +43,7 @@ int indexOf(const char *string, char ch);
 float atoff(const char *string);
 int atoi(const char *string);
 
-/**
- * there is some BS related to isnan in MinGW, so let's have all the issues in one place
- * JMT -  Screw that, isnan is isnan, if mingw cant make it goes in the naughty bin.
- *        This should probably be guarded by an STM32F4 specific macro as well.
- */
-#ifdef __MINGW32__
 #define cisnan(f) (*(((int*) (&f))) == 0x7FC00000)
-#else
-#define cisnan isnan
-#endif
-  
 #define UNUSED(x) (void)(x)
   
 int absI(int32_t value);