diff --git a/LUFA/ManPages/GettingStarted.txt b/LUFA/ManPages/GettingStarted.txt
index 66be59bfa2e0b0c0eb7f667873b2d882706ec05e..a1e5e1f4b6bf5a01cfe54f7cbfd4eb93fb0f11ea 100644
--- a/LUFA/ManPages/GettingStarted.txt
+++ b/LUFA/ManPages/GettingStarted.txt
@@ -13,6 +13,10 @@
  *  popular Atmel USB demonstration board to date. To learn how to reconfigure, recompile and program the included
  *  LUFA applications using different settings, see the subsections below.
  *
+ *  Most of the included demos in the /Demos/ folder come in both ClassDriver and LowLevel varieties. If you are new
+ *  to LUFA, it is highly recommended that you look at the ClassDriver versions first, which use the premade USB
+ *  Class Drivers (\ref Group_USBClassDrivers) to simplify the use of the standard USB classes in user applications.
+ *
  *  For an overview of the included library applications, bootloaders and demos, see \ref Page_LibraryApps.
  *
  *  <b>Subsections:</b>
diff --git a/LUFA/ManPages/LUFAPoweredProjects.txt b/LUFA/ManPages/LUFAPoweredProjects.txt
index b03b9083d0a1976d9158d31496c59d721cea81f2..0dbab214fbf18cd3f79fdc8d1270ee7a05fce5d9 100644
--- a/LUFA/ManPages/LUFAPoweredProjects.txt
+++ b/LUFA/ManPages/LUFAPoweredProjects.txt
@@ -32,6 +32,7 @@
  *  The following are known hobbyist projects using LUFA. Most are open source, and show off interesting ways that the LUFA library
  *  can be incorporated into many different applications.
  *
+ *  - Accelerometer Game Joystick: http://www.crictor.co.il/he/episodes/joystick/
  *  - Arcade Controller: http://fletchtronics.net/arcade-controller-made-petunia
  *  - AVR USB Modem, a 3G Wireless Modem host: http://code.google.com/p/avrusbmodem/
  *  - Bicycle POV: http://www.code.google.com/p/bicycleledpov/
@@ -61,10 +62,9 @@
  *  solutions with no source code given.
  *
  *  - ARPS Locator: http://la3t.hamradio.no/lab//?id=tracker_en
- *  - BAP, A tiny LUFA based AVR Programmer: http://www.busware.de/tiki-index.php?page=BAP
  *  - Digital Survey Instruments Magnetometer and Pointer: http://www.digitalsurveyinstruments.com/
- *  - Lightweight CC110x USB dongle for 868MHz Protocols: http://busware.de/tiki-index.php?page=CUL
  *  - Penguino, an Arduino Board With On-Board LUFA Powered Debugger/Programmer: http://wiki.icy.com.au/PenguinoAVR
+ *  - Many of Busware's Products: http://www.busware.de/
  *  - MIDIFighter, a USB-MIDI controller: http://www.midifighter.com/
  *  - Mobo 4.3, a USB controlled all band (160-10m) HF SDR transceiver: http://sites.google.com/site/lofturj/mobo4_3
  *  - Retrode, a USB Games Console Cartridge Reader: http://www.snega2usb.com
diff --git a/Projects/TemperatureDataLogger/Lib/DS1307.c b/Projects/TemperatureDataLogger/Lib/DS1307.c
index 37817e97f61b052a7dff27a67700b38197c5ea6d..64e03df0d72796f293658159c266e36ee0acb2f3 100644
--- a/Projects/TemperatureDataLogger/Lib/DS1307.c
+++ b/Projects/TemperatureDataLogger/Lib/DS1307.c
@@ -7,11 +7,6 @@
 
 #include "DS1307.h"
 
-void DS1307_Init(void)
-{
-	// Nothing to initialize
-}
-
 void DS1307_SetDate(uint8_t Day, uint8_t Month, uint8_t Year)
 {
 #if defined(DUMMY_RTC)
diff --git a/Projects/TemperatureDataLogger/Lib/DS1307.h b/Projects/TemperatureDataLogger/Lib/DS1307.h
index 491836079559bd3f2b1d3b3b97dd2b7eac290889..90b91e3e8890c307a87ff0f8dce18f502113b531 100644
--- a/Projects/TemperatureDataLogger/Lib/DS1307.h
+++ b/Projects/TemperatureDataLogger/Lib/DS1307.h
@@ -100,8 +100,6 @@
 		#define DS1307_ADDRESS_WRITE  0b11010000
 
 	/* Function Prototypes: */
-		void DS1307_Init(void);
-		
 		void DS1307_SetDate(uint8_t Day, uint8_t Month, uint8_t Year);
 		void DS1307_SetTime(uint8_t Hour, uint8_t Minute, uint8_t Second);
 		
diff --git a/Projects/TemperatureDataLogger/TempDataLogger.c b/Projects/TemperatureDataLogger/TempDataLogger.c
index 2f2e8daf7cea5a26283aa5506163436419488681..7d26ee25d9307d5d5f9adf69638c78af2c9f40f0 100644
--- a/Projects/TemperatureDataLogger/TempDataLogger.c
+++ b/Projects/TemperatureDataLogger/TempDataLogger.c
@@ -199,6 +199,7 @@ void SetupHardware(void)
 	Temperature_Init();
 	Dataflash_Init();
 	USB_Init();
+	TWI_Init();
 	
 	/* 500ms logging interval timer configuration */
 	OCR1A   = ((F_CPU / 1024) / 2);
diff --git a/Projects/TemperatureDataLogger/makefile b/Projects/TemperatureDataLogger/makefile
index 622bb1c84844b9aef90d4f7934de7c2d828e159c..8fd2c2941ce93154314d40318240c8da14c01f03 100644
--- a/Projects/TemperatureDataLogger/makefile
+++ b/Projects/TemperatureDataLogger/makefile
@@ -193,12 +193,8 @@ CSTANDARD = -std=gnu99
 
 # Place -D or -U options here for C sources
 CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)
-CDEFS += -DAVR_RESET_LINE_PORT="PORTD"
-CDEFS += -DAVR_RESET_LINE_DDR="DDRD"
-CDEFS += -DAVR_RESET_LINE_MASK="(1 << 4)"
-CDEFS += -DAVR_RESET_PULSE_MS=10
-CDEFS += -DTX_RX_LED_PULSE_MS=30
-CDEFS += -DPING_PONG_LED_PULSE_MS=100
+CDEFS += -DDUMMY_RTC
+
 
 # Place -D or -U options here for ASM sources
 ADEFS = -DF_CPU=$(F_CPU)