diff --git a/master/master/config.h b/master/master/config.h
--- a/master/master/config.h
+++ b/master/master/config.h
@@ -17,7 +17,7 @@
 // Module config (master.c)
 // --------------------------------------------------------------------------
 
-#define DEBUG_OUTPUT
+//#define DEBUG_OUTPUT
 
 #define F_CPU 11059200
 #define MODULE_ID '1'
diff --git a/master/master/lib/gps.c b/master/master/lib/gps.c
--- a/master/master/lib/gps.c
+++ b/master/master/lib/gps.c
@@ -93,6 +93,10 @@ char* get_dayofmonth() {
 	return dayofmonth;
 }
 
+bool gps_hasfix() {
+	return strcmp("99.99", get_hdop());
+}
+
 char variation[9];	//xxx.xb
 int calculatedChecksum;
 int receivedChecksum;
diff --git a/master/master/lib/gps.h b/master/master/lib/gps.h
--- a/master/master/lib/gps.h
+++ b/master/master/lib/gps.h
@@ -13,6 +13,9 @@
 
 #ifndef GPSMKA_H_
 #define GPSMKA_H_
+
+#include <stdbool.h>
+
 #define GGA_MESSAGE
 #define RMC_MESSAGE
 #define UKN_MESSAGE
@@ -26,6 +29,7 @@ char* get_course();
 char* get_hdop();
 char* get_sv();
 char* get_dayofmonth();
+bool gps_hasfix();
 void parse_gps_transmission(void);
 void XORbyteWithChecksum(uint8_t byte);
 
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
@@ -72,7 +72,7 @@ void sensordata_logvalues() {
 			csvHeader[0] = 0x00;
 		
 			// Add master data headers
-			snprintf(csvHeader, 128, "Time,BoardTemp,Lat,Lon,HDOP,Speed,GPS SV,");
+			snprintf(csvHeader, 128, "Time,BoardTemp,GPSTime,GPSLat,GPSLon,GPSSpeed,GPSHDOP,GPSCourse,GPSSV");
 		
 			// Add slave data headers
 			for(uint8_t i=0; i<MAX_NUM_SLAVES; i++) {
@@ -93,7 +93,7 @@ void sensordata_logvalues() {
 	
 		// Write CSV sensor values to SD card
 		logbuf[0] = 0x00;
-		snprintf(logbuf, 128, "%lu,%d,%u,%s,%s,%s,%s,%s", time_millis(), sensors_getBoardTemp(),get_timestamp(),get_latitude(),get_longitude(),get_speedKnots(),get_hdop(), get_course());
+		snprintf(logbuf, 128, "%lu,%d,%u,%s,%s,%s,%s,%s,%s,", time_millis(), sensors_getBoardTemp(),get_timestamp(),get_latitude(),get_longitude(),get_speedKnots(),get_hdop(), get_course(), get_sv());
 		for(int i=0; i<MAX_NUM_SLAVES; i++) {
 			for(int j=0; j<MAX_NUM_SENSORS; j++) {
 				int16_t tmp = sensordata_get(i, j);
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
@@ -1,5 +1,5 @@
 /*
- * Master Firmware: Slave Sensor Data Aquisition
+ * Master Firmware: Slave Sensor Data Acquisition
  *
  * Wireless Observational Modular Aerial Network
  * 
@@ -93,6 +93,7 @@ void slavesensors_network_scan() {
 	#endif
 	
 	_delay_ms(500); // xbee warmup
+	_delay_ms(200); // xbee warmup
 	wdt_reset();
 	
 	led_on(LED_ACTIVITY);
diff --git a/master/master/master.c b/master/master/master.c
--- a/master/master/master.c
+++ b/master/master/master.c
@@ -96,11 +96,11 @@ int main(void)
 			heater_regulateTemp();
 			
 			// Turn on sideboard LED if we have a fix
-			if(strcmp("99.99", get_hdop()) == 0) {
-				led_off(LED_SIDEBOARD);
+			if(gps_hasfix()) {
+				led_on(LED_SIDEBOARD);
 			}
 			else {
-				led_on(LED_SIDEBOARD);
+				led_off(LED_SIDEBOARD);
 			}
 			
 			sensors_readBoardTemp();