 #include <avr/pgmspace.h>
 #include <util/parity.h>
 
-#define debug
+#define DEBUG 1
+
 // ATtiny's only support outbound serial @ 38400 baud, and no DataFlash logging
 
 #if defined(__AVR_ATtiny84__) || defined(__AVR_ATtiny44__)
 #define SERIAL_BAUD 38400
-#define JNMicro
 #else
 #define SERIAL_BAUD 57600
 
-#define DATAFLASH 0          // Enabling flash for none flash equipped nodes causes odd problems - particularly non-Jee kit
+// Enabling dataflash code may cause problems with non-JeeLink configurations
+#define DATAFLASH 0
 // check for presence of DataFlash memory on JeeLink
 #define FLASH_MBIT  16  // support for various dataflash sizes: 4/8/16 Mbit
 

/// Useful url: http://blog.strobotics.com.au/2009/07/27/rfm12-tutorial-part-3a/
// 4 bit
#define QUIET   0x1      // quiet mode
#define V10     0x2      // Indicates a version of RF12Demo up to version 10.
// ----------------
// 8 bit
#define COLLECT 0x20     // collect mode, i.e. pass incoming without sending acks

#endif
}
void initialize() {
  config.nodeId = eeprom_read_byte(RF12_EEPROM_ADDR);
  config.group = eeprom_read_byte(RF12_EEPROM_ADDR + 1);
  frequency = eeprom_read_byte(RF12_EEPROM_ADDR + 2);
  config.flags = frequency >> 4;               // Extract the flag nibble
  if (config.flags & V10)                      // Is this a pre v11 eeprom
    frequency = 1600; 
  else // Lose flag nibble to get frequency high order
    frequency = ((frequency & 0x0F)  << 8) + (eeprom_read_byte(RF12_EEPROM_ADDR + 3));
}
void loop() {
  if (Serial.available())
