Index: branches/FEPSimulator/build/Debug/GNU-MacOSX/Main.o.d
===================================================================
--- branches/FEPSimulator/build/Debug/GNU-MacOSX/Main.o.d	(revision 148)
+++ 	(revision )
@@ -1,16 +1,0 @@
-build/Debug/GNU-MacOSX/Main.o: Main.cpp FEPSim.h fep.h NetworkReader.h \
- network.h tinyxml/tinyxml.h tinyxml/tinystr.h DataPacker.h
-
-FEPSim.h:
-
-fep.h:
-
-NetworkReader.h:
-
-network.h:
-
-tinyxml/tinyxml.h:
-
-tinyxml/tinystr.h:
-
-DataPacker.h:
Index: branches/FEPSimulator/network.h
===================================================================
--- branches/FEPSimulator/network.h	(revision 80)
+++ branches/FEPSimulator/network.h	(revision 159)
@@ -9,7 +9,9 @@
 
 /*** CONSTANTS ***/
-const int Fixed_Byte_To_Checksum = 25; // the first byte is not considered in the calculation of "BYTE 2"
+const int Fixed_Byte_To_Checksum = 25; // the first byte is not considered 
+                                       //in the calculation of "BYTE 2"
 const int CONTROL_DATA_LEN = 27;
 
+// loop detector / lane type arrays
 char * const dp5[8] = { "ML_1", "ML_2", "ML_3", "ML_4", "ML_5",
                                                 "ML_6", "HOV_Lane", "FYW_Conn"};
@@ -21,5 +23,6 @@
                                                 "SD_6", "Pass_Vol_Count", "X"};
 
-// FEP line: has several lds
+// FEP line: Represents a serial communication line from field stations to the 
+// An FEP Line has several Loop Detector Stations (Stations) connected)
 typedef struct fep_line FEP_LINE;
 struct  fep_line
@@ -37,11 +40,14 @@
 };
 
-// Loop detector
+// Loop Detector: A single sensor that detects the volume, occupancy, and speed
+// in a single highway lane
 typedef struct loop LOOP;
 struct loop
 {
+    // meta data
     long loopID;
     char *loop_loc;
     
+    // dynamic data
     int vol;
     float occ;
@@ -49,5 +55,6 @@
 };
 
-// Loop detector station: has several loops
+// Loop detector station: A single field station that contains multiple loops at
+// a location
 typedef struct Station STATION;
 struct  Station
@@ -68,4 +75,6 @@
 };
 
+// A helper structure used to pack the volume and occupancy at a loop into
+// a two byte message
 typedef struct volOcc VOLOCC;
 struct  volOcc
Index: branches/FEPSimulator/DataPacker.cpp
===================================================================
--- branches/FEPSimulator/DataPacker.cpp	(revision 156)
+++ branches/FEPSimulator/DataPacker.cpp	(revision 159)
@@ -1,4 +1,3 @@
 #include "DataPacker.h"
-#include <stdio.h>
 
 unsigned char * DataPacker::msg;
Index: branches/FEPSimulator/DataPacker.h
===================================================================
--- branches/FEPSimulator/DataPacker.h	(revision 82)
+++ branches/FEPSimulator/DataPacker.h	(revision 159)
@@ -17,4 +17,5 @@
 #include <iostream>
 #include <string.h>
+#include <stdio.h>
 
 class DataPacker {