diff --git a/Bootloaders/CDC/BootloaderCDC.txt b/Bootloaders/CDC/BootloaderCDC.txt
index c518195ebc1fe5ba55ae11e54268563bce4a6d58..e3faf54345b63aa4506340ee760c616bb84d4d17 100644
--- a/Bootloaders/CDC/BootloaderCDC.txt
+++ b/Bootloaders/CDC/BootloaderCDC.txt
@@ -5,6 +5,19 @@
  */
  
 /** \mainpage CDC Class USB AVR Bootloader
+ *
+ *  \section SSec_Compat Demo Compatibility:
+ *
+ *  The following table indicates what microcontrollers are compatible with this demo.
+ *
+ *  - AT90USB1287
+ *  - AT90USB1286
+ *  - AT90USB647
+ *  - AT90USB646
+ *  - ATMEGA32U6
+ *  - ATMEGA32U4
+ *  - ATMEGA16U4
+ *  - AT90USB162
  *
  *  \section SSec_Info USB Information:
  *
diff --git a/Bootloaders/DFU/BootloaderDFU.txt b/Bootloaders/DFU/BootloaderDFU.txt
index 05bfa71fa9ffcfc5076d8797036dba7cf13095bd..ca2f1651d79b7d68ac1adcbb83d723a129063c49 100644
--- a/Bootloaders/DFU/BootloaderDFU.txt
+++ b/Bootloaders/DFU/BootloaderDFU.txt
@@ -5,6 +5,19 @@
  */
  
 /** \mainpage DFU Class USB AVR Bootloader
+ *
+ *  \section SSec_Compat Demo Compatibility:
+ *
+ *  The following table indicates what microcontrollers are compatible with this demo.
+ *
+ *  - AT90USB1287
+ *  - AT90USB1286
+ *  - AT90USB647
+ *  - AT90USB646
+ *  - ATMEGA32U6
+ *  - ATMEGA32U4
+ *  - ATMEGA16U4
+ *  - AT90USB162
  *
  *  \section SSec_Info USB Information:
  *
diff --git a/Bootloaders/TeensyHID/TeensyHID.txt b/Bootloaders/TeensyHID/TeensyHID.txt
index 3ef5e9f40c69942c1977a62d08eede046a2f8b6f..93862c67463ed03475e72647421a8846671343d0 100644
--- a/Bootloaders/TeensyHID/TeensyHID.txt
+++ b/Bootloaders/TeensyHID/TeensyHID.txt
@@ -5,6 +5,13 @@
  */
  
 /** \mainpage Teensy HID Class USB AVR Bootloader
+ *
+ *  \section SSec_Compat Demo Compatibility:
+ *
+ *  The following table indicates what microcontrollers are compatible with this demo.
+ *
+ *  - AT90USB646
+ *  - AT90USB162
  *
  *  \section SSec_Info USB Information:
  *
diff --git a/Demos/Device/ClassDriver/AudioInput/AudioInput.txt b/Demos/Device/ClassDriver/AudioInput/AudioInput.txt
index cf7125949a869d888d93cb5bcfbb814c1c1d5a85..0ed4ed0c1a07b8c17fa2893f68f2b867d2d7be78 100644
--- a/Demos/Device/ClassDriver/AudioInput/AudioInput.txt
+++ b/Demos/Device/ClassDriver/AudioInput/AudioInput.txt
@@ -5,6 +5,16 @@
  */
  
 /** \mainpage Audio Input Device Demo
+ *
+ *  \section SSec_Compat Demo Compatibility:
+ *
+ *  The following table indicates what microcontrollers are compatible with this demo.
+ *
+ *  - AT90USB1287
+ *  - AT90USB1286
+ *  - AT90USB647
+ *  - AT90USB646
+ *  - ATMEGA32U6
  *
  *  \section SSec_Info USB Information:
  *
diff --git a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.txt b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.txt
index a47f9b5f3a7b03251999431b0a303f55e22c2748..ffae9ed5763dd1d6511f8274e9fc52f4b2281fe7 100644
--- a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.txt
+++ b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.txt
@@ -5,6 +5,16 @@
  */
  
 /** \mainpage Audio Output Device Demo
+ *
+ *  \section SSec_Compat Demo Compatibility:
+ *
+ *  The following table indicates what microcontrollers are compatible with this demo.
+ *
+ *  - AT90USB1287
+ *  - AT90USB1286
+ *  - AT90USB647
+ *  - AT90USB646
+ *  - ATMEGA32U6
  *
  *  \section SSec_Info USB Information:
  *
diff --git a/Demos/Device/ClassDriver/CDC/CDC.txt b/Demos/Device/ClassDriver/CDC/CDC.txt
index 8e13b55b45d18c5a7d8ee27456957003cf4c788b..397ed361f3107616f3f6911d2c5abe67a177a966 100644
--- a/Demos/Device/ClassDriver/CDC/CDC.txt
+++ b/Demos/Device/ClassDriver/CDC/CDC.txt
@@ -5,6 +5,20 @@
  */
  
 /** \mainpage Communications Device Class Device (Virtual Serial Port)
+ *
+ *  \section SSec_Compat Demo Compatibility:
+ *
+ *  The following table indicates what microcontrollers are compatible with this demo.
+ *
+ *  - AT90USB1287
+ *  - AT90USB1286
+ *  - AT90USB647
+ *  - AT90USB646
+ *  - ATMEGA32U6
+ *  - ATMEGA32U4
+ *  - ATMEGA16U4
+ *  - AT90USB162
+ *  - AT90USB82
  *
  *  \section SSec_Info USB Information:
  *
diff --git a/Demos/Device/ClassDriver/DualCDC/DualCDC.txt b/Demos/Device/ClassDriver/DualCDC/DualCDC.txt
index 6e086029b0969f1817a1de2e5f6a76ce4fa40d2a..eece70614a49a340ac0880cfe796713e9cb8c33d 100644
--- a/Demos/Device/ClassDriver/DualCDC/DualCDC.txt
+++ b/Demos/Device/ClassDriver/DualCDC/DualCDC.txt
@@ -5,6 +5,20 @@
  */
  
 /** \mainpage Dual Communications Device Class Device (Dual Virtual Serial Port)
+ *
+ *  \section SSec_Compat Demo Compatibility:
+ *
+ *  The following table indicates what microcontrollers are compatible with this demo.
+ *
+ *  - AT90USB1287
+ *  - AT90USB1286
+ *  - AT90USB647
+ *  - AT90USB646
+ *  - ATMEGA32U6
+ *  - ATMEGA32U4
+ *  - ATMEGA16U4
+ *  - AT90USB162
+ *  - AT90USB82
  *
  *  \section SSec_Info USB Information:
  *
diff --git a/Demos/Device/ClassDriver/GenericHID/GenericHID.txt b/Demos/Device/ClassDriver/GenericHID/GenericHID.txt
index a40b78b1f3cdf37f8c14029649ee23a3da099c7a..fc5c136a28c8a2f58847c812803e1c3ad61ab694 100644
--- a/Demos/Device/ClassDriver/GenericHID/GenericHID.txt
+++ b/Demos/Device/ClassDriver/GenericHID/GenericHID.txt
@@ -5,6 +5,20 @@
  */
  
 /** \mainpage Generic HID Device
+ *
+ *  \section SSec_Compat Demo Compatibility:
+ *
+ *  The following table indicates what microcontrollers are compatible with this demo.
+ *
+ *  - AT90USB1287
+ *  - AT90USB1286
+ *  - AT90USB647
+ *  - AT90USB646
+ *  - ATMEGA32U6
+ *  - ATMEGA32U4
+ *  - ATMEGA16U4
+ *  - AT90USB162
+ *  - AT90USB82
  *
  *  \section SSec_Info USB Information:
  *
diff --git a/Demos/Device/ClassDriver/Joystick/Joystick.txt b/Demos/Device/ClassDriver/Joystick/Joystick.txt
index 7d47ae92fc72435bcf816d7448ff41fef477d7a0..d2fdaafd9d8034f2960ba5bda9df851c2937c5f3 100644
--- a/Demos/Device/ClassDriver/Joystick/Joystick.txt
+++ b/Demos/Device/ClassDriver/Joystick/Joystick.txt
@@ -5,6 +5,20 @@
  */
  
 /** \mainpage Joystick Device Demo
+ *
+ *  \section SSec_Compat Demo Compatibility:
+ *
+ *  The following table indicates what microcontrollers are compatible with this demo.
+ *
+ *  - AT90USB1287
+ *  - AT90USB1286
+ *  - AT90USB647
+ *  - AT90USB646
+ *  - ATMEGA32U6
+ *  - ATMEGA32U4
+ *  - ATMEGA16U4
+ *  - AT90USB162
+ *  - AT90USB82
  *
  *  \section SSec_Info USB Information:
  *
diff --git a/Demos/Device/ClassDriver/Keyboard/Keyboard.txt b/Demos/Device/ClassDriver/Keyboard/Keyboard.txt
index 3fc9bee3a1d86918b56526385d0fdbb531143dd7..e1f6785f76b98da6530e7b3f5ebc0617b0bf7ed0 100644
--- a/Demos/Device/ClassDriver/Keyboard/Keyboard.txt
+++ b/Demos/Device/ClassDriver/Keyboard/Keyboard.txt
@@ -5,6 +5,20 @@
  */
  
 /** \mainpage Keyboard Device Demo
+ *
+ *  \section SSec_Compat Demo Compatibility:
+ *
+ *  The following table indicates what microcontrollers are compatible with this demo.
+ *
+ *  - AT90USB1287
+ *  - AT90USB1286
+ *  - AT90USB647
+ *  - AT90USB646
+ *  - ATMEGA32U6
+ *  - ATMEGA32U4
+ *  - ATMEGA16U4
+ *  - AT90USB162
+ *  - AT90USB82
  *
  *  \section SSec_Info USB Information:
  *
diff --git a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.txt b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.txt
index 3e31057caf6c2ba54247a0e216d5dcc183d43d83..ca08602b7a1b82df19c2d4f644074cae3ec2a745 100644
--- a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.txt
+++ b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.txt
@@ -5,6 +5,20 @@
  */
  
 /** \mainpage Dual HID Keyboard and Mouse Device Demo
+ *
+ *  \section SSec_Compat Demo Compatibility:
+ *
+ *  The following table indicates what microcontrollers are compatible with this demo.
+ *
+ *  - AT90USB1287
+ *  - AT90USB1286
+ *  - AT90USB647
+ *  - AT90USB646
+ *  - ATMEGA32U6
+ *  - ATMEGA32U4
+ *  - ATMEGA16U4
+ *  - AT90USB162
+ *  - AT90USB82
  *
  *  \section SSec_Info USB Information:
  *
diff --git a/Demos/Device/ClassDriver/MIDI/MIDI.txt b/Demos/Device/ClassDriver/MIDI/MIDI.txt
index 5a3135009ccc32fefd66e5d710e92e8fbe307379..30f5c7d13d2158701246c9a195c1945800e50776 100644
--- a/Demos/Device/ClassDriver/MIDI/MIDI.txt
+++ b/Demos/Device/ClassDriver/MIDI/MIDI.txt
@@ -5,6 +5,20 @@
  */
  
 /** \mainpage MIDI Input Device Demo
+ *
+ *  \section SSec_Compat Demo Compatibility:
+ *
+ *  The following table indicates what microcontrollers are compatible with this demo.
+ *
+ *  - AT90USB1287
+ *  - AT90USB1286
+ *  - AT90USB647
+ *  - AT90USB646
+ *  - ATMEGA32U6
+ *  - ATMEGA32U4
+ *  - ATMEGA16U4
+ *  - AT90USB162
+ *  - AT90USB82
  *
  *  \section SSec_Info USB Information:
  *
diff --git a/Demos/Device/ClassDriver/MassStorage/MassStorage.txt b/Demos/Device/ClassDriver/MassStorage/MassStorage.txt
index 1d06cb66d0cf25d3b1d44fb92f5ab1cb10c4d520..7046b704e75297e94e2fdbae747085a75902148b 100644
--- a/Demos/Device/ClassDriver/MassStorage/MassStorage.txt
+++ b/Demos/Device/ClassDriver/MassStorage/MassStorage.txt
@@ -5,6 +5,20 @@
  */
  
 /** \mainpage Mass Storage Device Demo
+ *
+ *  \section SSec_Compat Demo Compatibility:
+ *
+ *  The following table indicates what microcontrollers are compatible with this demo.
+ *
+ *  - AT90USB1287
+ *  - AT90USB1286
+ *  - AT90USB647
+ *  - AT90USB646
+ *  - ATMEGA32U6
+ *  - ATMEGA32U4
+ *  - ATMEGA16U4
+ *  - AT90USB162
+ *  - AT90USB82
  *
  *  \section SSec_Info USB Information:
  *
diff --git a/Demos/Device/ClassDriver/Mouse/Mouse.txt b/Demos/Device/ClassDriver/Mouse/Mouse.txt
index 07982a713b104240a1d12a7a0500d62da05552c4..54bf9000ac64b5e92c3c2de902549f214c7b1aec 100644
--- a/Demos/Device/ClassDriver/Mouse/Mouse.txt
+++ b/Demos/Device/ClassDriver/Mouse/Mouse.txt
@@ -5,6 +5,20 @@
  */
  
 /** \mainpage Mouse Device Demo
+ *
+ *  \section SSec_Compat Demo Compatibility:
+ *
+ *  The following table indicates what microcontrollers are compatible with this demo.
+ *
+ *  - AT90USB1287
+ *  - AT90USB1286
+ *  - AT90USB647
+ *  - AT90USB646
+ *  - ATMEGA32U6
+ *  - ATMEGA32U4
+ *  - ATMEGA16U4
+ *  - AT90USB162
+ *  - AT90USB82
  *
  *  \section SSec_Info USB Information:
  *
diff --git a/Demos/Device/ClassDriver/RNDISEthernet/Lib/TCP.h b/Demos/Device/ClassDriver/RNDISEthernet/Lib/TCP.h
index b7c991e125484dac3d68ecc82d38e0e1a2c9a805..b61de7e18cfaf99ed16a4680b93e022497b54d6e 100644
--- a/Demos/Device/ClassDriver/RNDISEthernet/Lib/TCP.h
+++ b/Demos/Device/ClassDriver/RNDISEthernet/Lib/TCP.h
@@ -52,7 +52,7 @@
 		#define MAX_TCP_CONNECTIONS             1
 
 		/** TCP window size, giving the maximum number of bytes which can be buffered at the one time */
-		#define TCP_WINDOW_SIZE                 1024
+		#define TCP_WINDOW_SIZE                 512
 		
 		/** Port number for HTTP transmissions */
 		#define TCP_PORT_HTTP                   SwapEndian_16(80)
diff --git a/Demos/Device/ClassDriver/RNDISEthernet/RNDISEthernet.txt b/Demos/Device/ClassDriver/RNDISEthernet/RNDISEthernet.txt
index 306cf85261b788866e48b99695a6051ae14be655..9725b04f8c3e5425d5ec7a5c429de4fd6154d6de 100644
--- a/Demos/Device/ClassDriver/RNDISEthernet/RNDISEthernet.txt
+++ b/Demos/Device/ClassDriver/RNDISEthernet/RNDISEthernet.txt
@@ -5,11 +5,45 @@
  */
  
 /** \mainpage RNDIS Class Ethernet Demo (with Webserver/Telnet)
+ *
+ *  \section SSec_Compat Demo Compatibility:
+ *
+ *  The following table indicates what microcontrollers are compatible with this demo.
+ *
+ *  - AT90USB1287
+ *  - AT90USB1286
+ *  - AT90USB647
+ *  - AT90USB646
  *
  *  \section SSec_Info USB Information:
  *
  *  The following table gives a rundown of the USB utilization of this demo.
  *
+ *  <table>
+ *   <tr>
+ *    <td><b>USB Mode:</b></td>
+ *    <td>Device</td>
+ *   </tr>
+ *   <tr>
+ *    <td><b>USB Class:</b></td>
+ *    <td>Communications Device Class (CDC)</td>
+ *   </tr>
+ *   <tr> 
+ *    <td><b>USB Subclass:</b></td>
+ *    <td>Remote NDIS (Microsoft Proprietary CDC Class Networking Standard)</td>
+ *   </tr>
+ *   <tr>
+ *    <td><b>Relevant Standards:</b></td>
+ *    <td>Microsoft RNDIS Specification</td>
+ *   </tr>
+ *   <tr>
+ *    <td><b>Usable Speeds:</b></td>
+ *    <td>Full Speed Mode</td>
+ *   </tr>
+ *  </table>
+ *
+ *  \section SSec_Description Project Description: 
+ *
  *  Remote Network Driver Interface demonstration application.
  *  This gives a simple reference application for implementing
  *  a CDC RNDIS device acting as a simple network interface for
@@ -41,31 +75,6 @@
  *  recommended that it be replaced with an external open source TCP/IP
  *  stack that is feature complete, such as the uIP stack.
  *
- *  \section SSec_Description Project Description: 
- *
- *  <table>
- *   <tr>
- *    <td><b>USB Mode:</b></td>
- *    <td>Device</td>
- *   </tr>
- *   <tr>
- *    <td><b>USB Class:</b></td>
- *    <td>Communications Device Class (CDC)</td>
- *   </tr>
- *   <tr> 
- *    <td><b>USB Subclass:</b></td>
- *    <td>Remote NDIS (Microsoft Proprietary CDC Class Networking Standard)</td>
- *   </tr>
- *   <tr>
- *    <td><b>Relevant Standards:</b></td>
- *    <td>Microsoft RNDIS Specification</td>
- *   </tr>
- *   <tr>
- *    <td><b>Usable Speeds:</b></td>
- *    <td>Full Speed Mode</td>
- *   </tr>
- *  </table>
- *
  *  \section SSec_Options Project Options
  *
  *  The following defines can be found in this demo, which can control the demo behaviour when defined, or changed in value.
diff --git a/Demos/Device/ClassDriver/USBtoSerial/USBtoSerial.txt b/Demos/Device/ClassDriver/USBtoSerial/USBtoSerial.txt
index e334672178994f0c2a8b0d5ab5f18be76a22cf16..17f64522ba0605846b7e9f3ed0384a9b429fd9bf 100644
--- a/Demos/Device/ClassDriver/USBtoSerial/USBtoSerial.txt
+++ b/Demos/Device/ClassDriver/USBtoSerial/USBtoSerial.txt
@@ -5,6 +5,20 @@
  */
  
 /** \mainpage USB to Serial Converter Demo (via CDC-ACM class)
+ *
+ *  \section SSec_Compat Demo Compatibility:
+ *
+ *  This demo is known to be compatible with the following microcontrollers:
+ *
+ *  - AT90USB1287
+ *  - AT90USB1286
+ *  - AT90USB647
+ *  - AT90USB646
+ *  - ATMEGA32U6
+ *  - ATMEGA32U4
+ *  - ATMEGA16U4
+ *  - AT90USB162
+ *  - AT90USB82
  *
  *  \section SSec_Info USB Information:
  *
diff --git a/Demos/Device/LowLevel/AudioInput/AudioInput.txt b/Demos/Device/LowLevel/AudioInput/AudioInput.txt
index cf7125949a869d888d93cb5bcfbb814c1c1d5a85..ca7fe1fa5a993d2c2cf2773fcc8fc9b35ded07fe 100644
--- a/Demos/Device/LowLevel/AudioInput/AudioInput.txt
+++ b/Demos/Device/LowLevel/AudioInput/AudioInput.txt
@@ -5,6 +5,15 @@
  */
  
 /** \mainpage Audio Input Device Demo
+ *
+ *  \section SSec_Compat Demo Compatibility:
+ *
+ *  The following table indicates what microcontrollers are compatible with this demo.
+ *
+ *  - AT90USB1287
+ *  - AT90USB1286
+ *  - AT90USB647
+ *  - AT90USB646
  *
  *  \section SSec_Info USB Information:
  *
diff --git a/Demos/Device/LowLevel/AudioOutput/AudioOutput.txt b/Demos/Device/LowLevel/AudioOutput/AudioOutput.txt
index a47f9b5f3a7b03251999431b0a303f55e22c2748..ffae9ed5763dd1d6511f8274e9fc52f4b2281fe7 100644
--- a/Demos/Device/LowLevel/AudioOutput/AudioOutput.txt
+++ b/Demos/Device/LowLevel/AudioOutput/AudioOutput.txt
@@ -5,6 +5,16 @@
  */
  
 /** \mainpage Audio Output Device Demo
+ *
+ *  \section SSec_Compat Demo Compatibility:
+ *
+ *  The following table indicates what microcontrollers are compatible with this demo.
+ *
+ *  - AT90USB1287
+ *  - AT90USB1286
+ *  - AT90USB647
+ *  - AT90USB646
+ *  - ATMEGA32U6
  *
  *  \section SSec_Info USB Information:
  *
diff --git a/Demos/Device/LowLevel/CDC/CDC.txt b/Demos/Device/LowLevel/CDC/CDC.txt
index 8e13b55b45d18c5a7d8ee27456957003cf4c788b..397ed361f3107616f3f6911d2c5abe67a177a966 100644
--- a/Demos/Device/LowLevel/CDC/CDC.txt
+++ b/Demos/Device/LowLevel/CDC/CDC.txt
@@ -5,6 +5,20 @@
  */
  
 /** \mainpage Communications Device Class Device (Virtual Serial Port)
+ *
+ *  \section SSec_Compat Demo Compatibility:
+ *
+ *  The following table indicates what microcontrollers are compatible with this demo.
+ *
+ *  - AT90USB1287
+ *  - AT90USB1286
+ *  - AT90USB647
+ *  - AT90USB646
+ *  - ATMEGA32U6
+ *  - ATMEGA32U4
+ *  - ATMEGA16U4
+ *  - AT90USB162
+ *  - AT90USB82
  *
  *  \section SSec_Info USB Information:
  *
diff --git a/Demos/Device/LowLevel/DualCDC/DualCDC.txt b/Demos/Device/LowLevel/DualCDC/DualCDC.txt
index 6e086029b0969f1817a1de2e5f6a76ce4fa40d2a..eece70614a49a340ac0880cfe796713e9cb8c33d 100644
--- a/Demos/Device/LowLevel/DualCDC/DualCDC.txt
+++ b/Demos/Device/LowLevel/DualCDC/DualCDC.txt
@@ -5,6 +5,20 @@
  */
  
 /** \mainpage Dual Communications Device Class Device (Dual Virtual Serial Port)
+ *
+ *  \section SSec_Compat Demo Compatibility:
+ *
+ *  The following table indicates what microcontrollers are compatible with this demo.
+ *
+ *  - AT90USB1287
+ *  - AT90USB1286
+ *  - AT90USB647
+ *  - AT90USB646
+ *  - ATMEGA32U6
+ *  - ATMEGA32U4
+ *  - ATMEGA16U4
+ *  - AT90USB162
+ *  - AT90USB82
  *
  *  \section SSec_Info USB Information:
  *
diff --git a/Demos/Device/LowLevel/GenericHID/GenericHID.txt b/Demos/Device/LowLevel/GenericHID/GenericHID.txt
index a40b78b1f3cdf37f8c14029649ee23a3da099c7a..fc5c136a28c8a2f58847c812803e1c3ad61ab694 100644
--- a/Demos/Device/LowLevel/GenericHID/GenericHID.txt
+++ b/Demos/Device/LowLevel/GenericHID/GenericHID.txt
@@ -5,6 +5,20 @@
  */
  
 /** \mainpage Generic HID Device
+ *
+ *  \section SSec_Compat Demo Compatibility:
+ *
+ *  The following table indicates what microcontrollers are compatible with this demo.
+ *
+ *  - AT90USB1287
+ *  - AT90USB1286
+ *  - AT90USB647
+ *  - AT90USB646
+ *  - ATMEGA32U6
+ *  - ATMEGA32U4
+ *  - ATMEGA16U4
+ *  - AT90USB162
+ *  - AT90USB82
  *
  *  \section SSec_Info USB Information:
  *
diff --git a/Demos/Device/LowLevel/Joystick/Joystick.txt b/Demos/Device/LowLevel/Joystick/Joystick.txt
index 7d47ae92fc72435bcf816d7448ff41fef477d7a0..d2fdaafd9d8034f2960ba5bda9df851c2937c5f3 100644
--- a/Demos/Device/LowLevel/Joystick/Joystick.txt
+++ b/Demos/Device/LowLevel/Joystick/Joystick.txt
@@ -5,6 +5,20 @@
  */
  
 /** \mainpage Joystick Device Demo
+ *
+ *  \section SSec_Compat Demo Compatibility:
+ *
+ *  The following table indicates what microcontrollers are compatible with this demo.
+ *
+ *  - AT90USB1287
+ *  - AT90USB1286
+ *  - AT90USB647
+ *  - AT90USB646
+ *  - ATMEGA32U6
+ *  - ATMEGA32U4
+ *  - ATMEGA16U4
+ *  - AT90USB162
+ *  - AT90USB82
  *
  *  \section SSec_Info USB Information:
  *
diff --git a/Demos/Device/LowLevel/Keyboard/Keyboard.txt b/Demos/Device/LowLevel/Keyboard/Keyboard.txt
index 3fc9bee3a1d86918b56526385d0fdbb531143dd7..e1f6785f76b98da6530e7b3f5ebc0617b0bf7ed0 100644
--- a/Demos/Device/LowLevel/Keyboard/Keyboard.txt
+++ b/Demos/Device/LowLevel/Keyboard/Keyboard.txt
@@ -5,6 +5,20 @@
  */
  
 /** \mainpage Keyboard Device Demo
+ *
+ *  \section SSec_Compat Demo Compatibility:
+ *
+ *  The following table indicates what microcontrollers are compatible with this demo.
+ *
+ *  - AT90USB1287
+ *  - AT90USB1286
+ *  - AT90USB647
+ *  - AT90USB646
+ *  - ATMEGA32U6
+ *  - ATMEGA32U4
+ *  - ATMEGA16U4
+ *  - AT90USB162
+ *  - AT90USB82
  *
  *  \section SSec_Info USB Information:
  *
diff --git a/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.txt b/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.txt
index 3e31057caf6c2ba54247a0e216d5dcc183d43d83..ca08602b7a1b82df19c2d4f644074cae3ec2a745 100644
--- a/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.txt
+++ b/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.txt
@@ -5,6 +5,20 @@
  */
  
 /** \mainpage Dual HID Keyboard and Mouse Device Demo
+ *
+ *  \section SSec_Compat Demo Compatibility:
+ *
+ *  The following table indicates what microcontrollers are compatible with this demo.
+ *
+ *  - AT90USB1287
+ *  - AT90USB1286
+ *  - AT90USB647
+ *  - AT90USB646
+ *  - ATMEGA32U6
+ *  - ATMEGA32U4
+ *  - ATMEGA16U4
+ *  - AT90USB162
+ *  - AT90USB82
  *
  *  \section SSec_Info USB Information:
  *
diff --git a/Demos/Device/LowLevel/MIDI/MIDI.txt b/Demos/Device/LowLevel/MIDI/MIDI.txt
index 5a3135009ccc32fefd66e5d710e92e8fbe307379..30f5c7d13d2158701246c9a195c1945800e50776 100644
--- a/Demos/Device/LowLevel/MIDI/MIDI.txt
+++ b/Demos/Device/LowLevel/MIDI/MIDI.txt
@@ -5,6 +5,20 @@
  */
  
 /** \mainpage MIDI Input Device Demo
+ *
+ *  \section SSec_Compat Demo Compatibility:
+ *
+ *  The following table indicates what microcontrollers are compatible with this demo.
+ *
+ *  - AT90USB1287
+ *  - AT90USB1286
+ *  - AT90USB647
+ *  - AT90USB646
+ *  - ATMEGA32U6
+ *  - ATMEGA32U4
+ *  - ATMEGA16U4
+ *  - AT90USB162
+ *  - AT90USB82
  *
  *  \section SSec_Info USB Information:
  *
diff --git a/Demos/Device/LowLevel/MassStorage/MassStorage.txt b/Demos/Device/LowLevel/MassStorage/MassStorage.txt
index 1d06cb66d0cf25d3b1d44fb92f5ab1cb10c4d520..7046b704e75297e94e2fdbae747085a75902148b 100644
--- a/Demos/Device/LowLevel/MassStorage/MassStorage.txt
+++ b/Demos/Device/LowLevel/MassStorage/MassStorage.txt
@@ -5,6 +5,20 @@
  */
  
 /** \mainpage Mass Storage Device Demo
+ *
+ *  \section SSec_Compat Demo Compatibility:
+ *
+ *  The following table indicates what microcontrollers are compatible with this demo.
+ *
+ *  - AT90USB1287
+ *  - AT90USB1286
+ *  - AT90USB647
+ *  - AT90USB646
+ *  - ATMEGA32U6
+ *  - ATMEGA32U4
+ *  - ATMEGA16U4
+ *  - AT90USB162
+ *  - AT90USB82
  *
  *  \section SSec_Info USB Information:
  *
diff --git a/Demos/Device/LowLevel/Mouse/Mouse.txt b/Demos/Device/LowLevel/Mouse/Mouse.txt
index 07982a713b104240a1d12a7a0500d62da05552c4..54bf9000ac64b5e92c3c2de902549f214c7b1aec 100644
--- a/Demos/Device/LowLevel/Mouse/Mouse.txt
+++ b/Demos/Device/LowLevel/Mouse/Mouse.txt
@@ -5,6 +5,20 @@
  */
  
 /** \mainpage Mouse Device Demo
+ *
+ *  \section SSec_Compat Demo Compatibility:
+ *
+ *  The following table indicates what microcontrollers are compatible with this demo.
+ *
+ *  - AT90USB1287
+ *  - AT90USB1286
+ *  - AT90USB647
+ *  - AT90USB646
+ *  - ATMEGA32U6
+ *  - ATMEGA32U4
+ *  - ATMEGA16U4
+ *  - AT90USB162
+ *  - AT90USB82
  *
  *  \section SSec_Info USB Information:
  *
diff --git a/Demos/Device/LowLevel/RNDISEthernet/Lib/TCP.h b/Demos/Device/LowLevel/RNDISEthernet/Lib/TCP.h
index e98085f29864a7208f67a2c6923506b51a6e1af1..eac682547ec797369bb58640685f838d3697e7ff 100644
--- a/Demos/Device/LowLevel/RNDISEthernet/Lib/TCP.h
+++ b/Demos/Device/LowLevel/RNDISEthernet/Lib/TCP.h
@@ -52,7 +52,7 @@
 		#define MAX_TCP_CONNECTIONS             1
 
 		/** TCP window size, giving the maximum number of bytes which can be buffered at the one time */
-		#define TCP_WINDOW_SIZE                 1024
+		#define TCP_WINDOW_SIZE                 512
 		
 		/** Port number for HTTP transmissions */
 		#define TCP_PORT_HTTP                   SwapEndian_16(80)
diff --git a/Demos/Device/LowLevel/RNDISEthernet/RNDISEthernet.txt b/Demos/Device/LowLevel/RNDISEthernet/RNDISEthernet.txt
index 306cf85261b788866e48b99695a6051ae14be655..9725b04f8c3e5425d5ec7a5c429de4fd6154d6de 100644
--- a/Demos/Device/LowLevel/RNDISEthernet/RNDISEthernet.txt
+++ b/Demos/Device/LowLevel/RNDISEthernet/RNDISEthernet.txt
@@ -5,11 +5,45 @@
  */
  
 /** \mainpage RNDIS Class Ethernet Demo (with Webserver/Telnet)
+ *
+ *  \section SSec_Compat Demo Compatibility:
+ *
+ *  The following table indicates what microcontrollers are compatible with this demo.
+ *
+ *  - AT90USB1287
+ *  - AT90USB1286
+ *  - AT90USB647
+ *  - AT90USB646
  *
  *  \section SSec_Info USB Information:
  *
  *  The following table gives a rundown of the USB utilization of this demo.
  *
+ *  <table>
+ *   <tr>
+ *    <td><b>USB Mode:</b></td>
+ *    <td>Device</td>
+ *   </tr>
+ *   <tr>
+ *    <td><b>USB Class:</b></td>
+ *    <td>Communications Device Class (CDC)</td>
+ *   </tr>
+ *   <tr> 
+ *    <td><b>USB Subclass:</b></td>
+ *    <td>Remote NDIS (Microsoft Proprietary CDC Class Networking Standard)</td>
+ *   </tr>
+ *   <tr>
+ *    <td><b>Relevant Standards:</b></td>
+ *    <td>Microsoft RNDIS Specification</td>
+ *   </tr>
+ *   <tr>
+ *    <td><b>Usable Speeds:</b></td>
+ *    <td>Full Speed Mode</td>
+ *   </tr>
+ *  </table>
+ *
+ *  \section SSec_Description Project Description: 
+ *
  *  Remote Network Driver Interface demonstration application.
  *  This gives a simple reference application for implementing
  *  a CDC RNDIS device acting as a simple network interface for
@@ -41,31 +75,6 @@
  *  recommended that it be replaced with an external open source TCP/IP
  *  stack that is feature complete, such as the uIP stack.
  *
- *  \section SSec_Description Project Description: 
- *
- *  <table>
- *   <tr>
- *    <td><b>USB Mode:</b></td>
- *    <td>Device</td>
- *   </tr>
- *   <tr>
- *    <td><b>USB Class:</b></td>
- *    <td>Communications Device Class (CDC)</td>
- *   </tr>
- *   <tr> 
- *    <td><b>USB Subclass:</b></td>
- *    <td>Remote NDIS (Microsoft Proprietary CDC Class Networking Standard)</td>
- *   </tr>
- *   <tr>
- *    <td><b>Relevant Standards:</b></td>
- *    <td>Microsoft RNDIS Specification</td>
- *   </tr>
- *   <tr>
- *    <td><b>Usable Speeds:</b></td>
- *    <td>Full Speed Mode</td>
- *   </tr>
- *  </table>
- *
  *  \section SSec_Options Project Options
  *
  *  The following defines can be found in this demo, which can control the demo behaviour when defined, or changed in value.
diff --git a/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.txt b/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.txt
index e334672178994f0c2a8b0d5ab5f18be76a22cf16..bdca6f947260f95ee92fddeeda1c9ee53a264d34 100644
--- a/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.txt
+++ b/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.txt
@@ -5,6 +5,20 @@
  */
  
 /** \mainpage USB to Serial Converter Demo (via CDC-ACM class)
+ *
+ *  \section SSec_Compat Demo Compatibility:
+ *
+ *  The following table indicates what microcontrollers are compatible with this demo.
+ *
+ *  - AT90USB1287
+ *  - AT90USB1286
+ *  - AT90USB647
+ *  - AT90USB646
+ *  - ATMEGA32U6
+ *  - ATMEGA32U4
+ *  - ATMEGA16U4
+ *  - AT90USB162
+ *  - AT90USB82
  *
  *  \section SSec_Info USB Information:
  *
diff --git a/Demos/Host/ClassDriver/CDCHost/CDCHost.txt b/Demos/Host/ClassDriver/CDCHost/CDCHost.txt
index 0db804c25096aea4f5a1e35a187ded9da818973a..ef0a325cbdfec7c98427e15023705c96939c1611 100644
--- a/Demos/Host/ClassDriver/CDCHost/CDCHost.txt
+++ b/Demos/Host/ClassDriver/CDCHost/CDCHost.txt
@@ -5,6 +5,13 @@
  */
  
 /** \mainpage CDC Host Demo
+ *
+ *  \section SSec_Compat Demo Compatibility:
+ *
+ *  The following table indicates what microcontrollers are compatible with this demo.
+ *
+ *  - AT90USB1287
+ *  - AT90USB1286
  *
  *  \section SSec_Info USB Information:
  *
diff --git a/Demos/Host/LowLevel/CDCHost/CDCHost.txt b/Demos/Host/LowLevel/CDCHost/CDCHost.txt
index 4fac1d03d6823bdbc5d8f5b5b84f4d62626f7e11..30a88ba0c8bb050ca596b8f4b9b33a617e7fbd75 100644
--- a/Demos/Host/LowLevel/CDCHost/CDCHost.txt
+++ b/Demos/Host/LowLevel/CDCHost/CDCHost.txt
@@ -5,6 +5,13 @@
  */
  
 /** \mainpage CDC Host Demo
+ *
+ *  \section SSec_Compat Demo Compatibility:
+ *
+ *  The following table indicates what microcontrollers are compatible with this demo.
+ *
+ *  - AT90USB1287
+ *  - AT90USB1286
  *
  *  \section SSec_Info USB Information:
  *
diff --git a/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.txt b/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.txt
index d72dda103f8f7f784a93c686e3796b1003a804ff..0a82aaa0d4e17e259429b6f974fed65a5c2df971 100644
--- a/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.txt
+++ b/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.txt
@@ -5,6 +5,13 @@
  */
  
 /** \mainpage Generic HID Host Demo
+ *
+ *  \section SSec_Compat Demo Compatibility:
+ *
+ *  The following table indicates what microcontrollers are compatible with this demo.
+ *
+ *  - AT90USB1287
+ *  - AT90USB1286
  *
  *  \section SSec_Info USB Information:
  *
diff --git a/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.txt b/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.txt
index a3d5f717dfccda62cc03f707d61e8198b552c57a..6eba0ae2ea409906fc02cebb591f1fbc93afa3ae 100644
--- a/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.txt
+++ b/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.txt
@@ -5,6 +5,13 @@
  */
  
 /** \mainpage Keyboard Host Demo
+ *
+ *  \section SSec_Compat Demo Compatibility:
+ *
+ *  The following table indicates what microcontrollers are compatible with this demo.
+ *
+ *  - AT90USB1287
+ *  - AT90USB1286
  *
  *  \section SSec_Info USB Information:
  *
diff --git a/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.txt b/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.txt
index cd36706739558d77ef44703a81f6633f55e3235e..cc883ea2d6166e97e3b62646c19dd3ec89c60b70 100644
--- a/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.txt
+++ b/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.txt
@@ -5,6 +5,13 @@
  */
  
 /** \mainpage Keyboard Host With HID Descriptor Parser Demo
+ *
+ *  \section SSec_Compat Demo Compatibility:
+ *
+ *  The following table indicates what microcontrollers are compatible with this demo.
+ *
+ *  - AT90USB1287
+ *  - AT90USB1286
  *
  *  \section SSec_Info USB Information:
  *
diff --git a/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.txt b/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.txt
index 88b42e9373222407a1a783b86d5e0505798488e5..165245c2f100691fd193ad14225c912bfef94a47 100644
--- a/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.txt
+++ b/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.txt
@@ -5,6 +5,13 @@
  */
  
 /** \mainpage Mass Storage Host Demo
+ *
+ *  \section SSec_Compat Demo Compatibility:
+ *
+ *  The following table indicates what microcontrollers are compatible with this demo.
+ *
+ *  - AT90USB1287
+ *  - AT90USB1286
  *
  *  \section SSec_Info USB Information:
  *
diff --git a/Demos/Host/LowLevel/MouseHost/MouseHost.txt b/Demos/Host/LowLevel/MouseHost/MouseHost.txt
index 3838a7011604c9205d403cff3cde42abe6ab2039..d3106256d624487d27ccbff44f9abcb6b9a9a2b2 100644
--- a/Demos/Host/LowLevel/MouseHost/MouseHost.txt
+++ b/Demos/Host/LowLevel/MouseHost/MouseHost.txt
@@ -5,6 +5,13 @@
  */
  
 /** \mainpage Mouse Host Demo
+ *
+ *  \section SSec_Compat Demo Compatibility:
+ *
+ *  The following table indicates what microcontrollers are compatible with this demo.
+ *
+ *  - AT90USB1287
+ *  - AT90USB1286
  *
  *  \section SSec_Info USB Information:
  *
diff --git a/Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.txt b/Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.txt
index 3c83341a270614dd93139937d2dfbf1423ad0b30..77bd16f33f7a0283aa16931c8100aeac90baf9ec 100644
--- a/Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.txt
+++ b/Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.txt
@@ -5,6 +5,13 @@
  */
  
 /** \mainpage Mouse Host With HID Descriptor Parser Demo
+ *
+ *  \section SSec_Compat Demo Compatibility:
+ *
+ *  The following table indicates what microcontrollers are compatible with this demo.
+ *
+ *  - AT90USB1287
+ *  - AT90USB1286
  *
  *  \section SSec_Info USB Information:
  *
diff --git a/Demos/Host/LowLevel/StillImageHost/StillImageHost.txt b/Demos/Host/LowLevel/StillImageHost/StillImageHost.txt
index 4cdfe63466f045d4a1b8f881eba1d21d7854e74c..b2a8a84cf49d0c78cd8505693a6d1eaf399c1891 100644
--- a/Demos/Host/LowLevel/StillImageHost/StillImageHost.txt
+++ b/Demos/Host/LowLevel/StillImageHost/StillImageHost.txt
@@ -5,6 +5,13 @@
  */
  
 /** \mainpage Still Image Host Demo
+ *
+ *  \section SSec_Compat Demo Compatibility:
+ *
+ *  The following table indicates what microcontrollers are compatible with this demo.
+ *
+ *  - AT90USB1287
+ *  - AT90USB1286
  *
  *  \section SSec_Info USB Information:
  *
diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index f22a9ff04fa88fb9a8ab2b548519087a7d214f3c..04213ac1ee389ed65e5b22d2c276a702f2382798 100644
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -23,6 +23,7 @@
   *  - Updated MassStorage device block write routines to use ping-pong Dataflash buffering to increase throughput by around 30%
   *  - Added new HOST_STATE_WaitForDeviceRemoval host state machine state for non-blocking disabling of device communications until the
   *    device has been removed (for use when an error occurs or communications with the device have completed)
+  *  - Added new FAST_STREAM_TRANSFERS compile time option for faster stream transfers via multiple bytes copied per stream loop
   *  
   *  <b>Changed:</b>
   *  - Deprecated psuedo-scheduler and removed dynamic memory allocator from the library (first no longer needed and second unused)
diff --git a/LUFA/ManPages/CompileTimeTokens.txt b/LUFA/ManPages/CompileTimeTokens.txt
index 796ee84848422422e62ae85a555e88909777a55a..3d15759e4ecec3850ff1f189102680f1ac74c20d 100644
--- a/LUFA/ManPages/CompileTimeTokens.txt
+++ b/LUFA/ManPages/CompileTimeTokens.txt
@@ -112,6 +112,13 @@
  *  by defining this token, reducing the compiled binary size. When removed, the stream functions no longer accept a callback function as
  *  a parameter.
  *
+ *  <b>FAST_STREAM_TRANSFERS</b> - ( \ref Group_EndpointPacketManagement , \ref Group_PipePacketManagement )\n
+ *  By default, streams are transferred internally via a loop, sending or receiving one byte per iteration before checking for a bank full
+ *  or empty condition. This allows for multiple stream functions to be chained together easily, as there are no alignment issues. However,
+ *  this can lead to heavy performance penalties in applications where large streams are used frequently. When this compile time option is
+ *  used, bytes are sent or recevied in groups of 8 bytes at a time increasing performance at the expense of a larger flash memory consumption
+ *  due to the extra code required to deal with byte alignment.
+ *
  *  <b>USB_HOST_TIMEOUT_MS</b> - ( \ref Group_Host ) \n
  *  When a control transfer is initiated in host mode to an attached device, a timeout is used to abort the transfer if the attached
  *  device fails to respond within the timeout period. This token may be defined to a non-zero 16-bit value to set the timeout period for
diff --git a/LUFA/ManPages/FutureChanges.txt b/LUFA/ManPages/FutureChanges.txt
index 2e348d53ec6960b90f53d8ad805010d07325cd5c..8d2545f2971e8e9ceb70c1fb8b61191f7bec5a2f 100644
--- a/LUFA/ManPages/FutureChanges.txt
+++ b/LUFA/ManPages/FutureChanges.txt
@@ -21,11 +21,8 @@
   *  - Add standardized descriptor names to device and host class driver structures
   *  - Add in INTERRUPT_CONTROL_PIPE to use HSOFI to trigger calls to the host state machine
   *  - Make Suspend host state suspend USB bus frames
-  *  - Split StillImageHost demo into lib directory
   *  - Add in Stream functions for PROGMEM, EEPROM -- move to templated system
   *  - Debug mode for pipe/endpoint calls
-  *  - Test and document new FAST_STREAM_TRANSFERS compile time option
-  *  - Demo hardware compatibility table/list
   *
   *  <b>Targeted for Future Releases:</b>
   *  - Remake AVRStudio project files
diff --git a/Projects/Magstripe/Magstripe.txt b/Projects/Magstripe/Magstripe.txt
index a0e600e57992b37d16312fbfba2c4c78709e51a0..739f14addfbe3bcb4bb979d85556865e595f54c7 100644
--- a/Projects/Magstripe/Magstripe.txt
+++ b/Projects/Magstripe/Magstripe.txt
@@ -5,6 +5,13 @@
  */
  
 /** \mainpage Denver Gingerich's USBSnoop Magnetic Card Reader Project
+ *
+ *  \section SSec_Compat Demo Compatibility:
+ *
+ *  The following table indicates what microcontrollers are compatible with this demo.
+ *
+ *  - AT90USB1287
+ *  - AT90USB1286
  *
  *  \section SSec_Info USB Information:
  *
diff --git a/Projects/MissileLauncher/MissileLauncher.txt b/Projects/MissileLauncher/MissileLauncher.txt
index 9d8916d0842479661e8a44ad81701d34a256be27..6c724879fc8038dc246b6d1bbdacc3fadd7edace 100644
--- a/Projects/MissileLauncher/MissileLauncher.txt
+++ b/Projects/MissileLauncher/MissileLauncher.txt
@@ -5,6 +5,13 @@
  */
  
 /** \mainpage Missile Launcher
+ *
+ *  \section SSec_Compat Demo Compatibility:
+ *
+ *  The following table indicates what microcontrollers are compatible with this demo.
+ *
+ *  - AT90USB1287
+ *  - AT90USB1286
  *
  *  \section SSec_Info USB Information:
  *