diff --git a/master/master/config.h b/master/master/config.h
--- a/master/master/config.h
+++ b/master/master/config.h
@@ -23,7 +23,7 @@
 #define MODULE_ID '1'
 #define BOARDTEMP_ADDR 0x90
 
-#define HEATER_THRESHOLD 25
+#define HEATER_THRESHOLD 60
 
 // --------------------------------------------------------------------------
 // Error Codes config (led.c, used throughout code)
diff --git a/master/master/lib/sensordata.c b/master/master/lib/sensordata.c
--- a/master/master/lib/sensordata.c
+++ b/master/master/lib/sensordata.c
@@ -80,13 +80,16 @@ void sensordata_logvalues()
 		// Only generate/write header the first time data is ready
 		if(!dataWasReady) 
 		{
-			#define CSV_HEADER_SIZE 512
-			char csvHeader[CSV_HEADER_SIZE];
+			#define CSV_BUFFER_SIZE 64
+			char csvHeader[CSV_BUFFER_SIZE];
 			csvHeader[0] = 0x00;
-		
-			// Add master data headers
-			snprintf(csvHeader, CSV_HEADER_SIZE, "Time,BoardTemp,GPSTime,GPSLat,GPSLon,GPSSpeed,GPSHDOP,GPSCourse,GPSSV,");
-		
+			
+			slavesensors_selectlogger();
+			
+			// Add master data headers
+			logger_log("Time,BoardTemp,GPSTime,GPSLat,GPSLon,GPSSpeed,GPSHDOP,GPSCourse,GPSSV,");
+			serial0_sendString("Time,BoardTemp,GPSTime,GPSLat,GPSLon,GPSSpeed,GPSHDOP,GPSCourse,GPSSV,");
+			
 			// Add slave data headers
 			for(uint8_t i=0; i<MAX_NUM_SLAVES; i++) 
 			{
@@ -97,23 +100,28 @@ void sensordata_logvalues()
 					// If a sensor value exists, write a header for it
 					if(tmp != -2111111111) 
 					{
-						snprintf(csvHeader + strlen(csvHeader), CSV_HEADER_SIZE-strlen(csvHeader),"%s-%s,", slavesensors_slavename(i), slavesensors_getLabel(j));
+						snprintf(csvHeader, CSV_BUFFER_SIZE,"%s-%s,", slavesensors_slavename(i), slavesensors_getLabel(j));
+						logger_log(csvHeader);
+						serial0_sendString(csvHeader);
 					}
 				}
 			}
 		
 			// End line and write to SD card
-			snprintf(csvHeader + strlen(csvHeader), CSV_HEADER_SIZE-strlen(csvHeader),"\r\n");
+			snprintf(csvHeader, CSV_BUFFER_SIZE,"\r\n");
 			logger_log(csvHeader);
+
+			serial0_sendString(csvHeader);
 			dataWasReady = true;
 		}
 	
 		// Write CSV sensor values to SD card
-		char logbuf[256];
+		#define CSV_LOGLINE_SIZE 512
+		char logbuf[CSV_LOGLINE_SIZE];
 		logbuf[0] = 0x00;
 		
 		// Write master sensor values
-		snprintf(logbuf, 256, "%lu,%d,%s,%s,%s,%s,%s,%s,%s,", time_millis(), sensors_getBoardTemp(),get_timestamp(),get_latitudeTrimmed(),get_longitudeTrimmed(),get_speedKnots(),get_hdop(), get_course(), get_sv());
+		snprintf(logbuf, CSV_LOGLINE_SIZE, "%lu,%d,%s,%s,%s,%s,%s,%s,%s,", time_millis(), sensors_getBoardTemp(),get_timestamp(),get_latitudeTrimmed(),get_longitudeTrimmed(),get_speedKnots(),get_hdop(), get_course(), get_sv());
 		
 		// Write slave sensor values
 		for(int i=0; i<MAX_NUM_SLAVES; i++) 
@@ -125,14 +133,14 @@ void sensordata_logvalues()
 				// If a sensor value exists, log the data
 				if(tmp != -2111111111) 
 				{
-					snprintf(logbuf + strlen(logbuf),256-strlen(logbuf)," %ld,", tmp);
+					snprintf(logbuf + strlen(logbuf),CSV_LOGLINE_SIZE-strlen(logbuf)," %ld,", tmp);
 				}
 			
 			}
 		}
 		
 		// End line and write to log
-		snprintf(logbuf + strlen(logbuf),256-strlen(logbuf),"\r\n");
+		snprintf(logbuf + strlen(logbuf),CSV_LOGLINE_SIZE-strlen(logbuf),"\r\n");
 		logger_log(logbuf);
 	}
 }
\ No newline at end of file
diff --git a/master/master/lib/slavesensors.c b/master/master/lib/slavesensors.c
--- a/master/master/lib/slavesensors.c
+++ b/master/master/lib/slavesensors.c
@@ -396,14 +396,9 @@ void slavesensors_startprocess()
 uint32_t beginRequest = 0;
 void slavesensors_request() 
 {
-	if(currentSlave == loggerIndex) 
-	{
-		currentSlave++;
-		if(currentSlave >= (nodeCount)) 
-		{
-			slavesensors_selectlogger();
-			return;
-		}
+	if(currentSlave == loggerIndex) {
+		gotoNextSlaveOrSensor(true);
+		return;
 	}
 	slavesensors_selectnode(currentSlave);
 	beginRequest = time_millis();
@@ -415,7 +410,6 @@ uint8_t numReadingsToExpect = 0; // numb
 
 void gotoNextSlaveOrSensor(bool fail) {
 	// If we finished all sensors for all slaves
-	
 	if(currentSlave >= (nodeCount-1) && currentSlaveSensor >= (numReadingsToExpect-1))
 	{
 		#ifdef DEBUG_GETSLAVEDATA
@@ -458,7 +452,7 @@ void gotoNextSlaveOrSensor(bool fail) {
 			}
 			else
 			{
-				currentSlave++; // increment to the next slave after the logger
+				currentSlave++; // Skip the logger: increment to the next slave after the logger
 			}
 		}