diff --git a/TODO.txt b/TODO.txt
index 919e915f3..10b141405 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -3,21 +3,22 @@
 2009-11-08: Release 0.1
 
 NEXT:
-- Add improved RFCOMM user-client
-  - use switch on RFCOMM control field in rfcomm.c packet handler
-- add configure option for uart flowcontrol
-- create <btstack/errors.h>
-- BUG: bt_close crashes when used in CocoaTouch app
-- BUG: BTdaemon crashes on iPhone when CocoaTouch app is closed (sometimes)
-  
-== Release 0.2 - Incoming L2CAP supported + improved Inq Dialog
-- CocoaTouch User Interface Components
-  - Provide BTstack class
-  - Warning and shutdown of Apple's stack
-- add timeouts to cocoa run loop
+
 - figure out how to receive iPhone System Power IONotifications (in BTdaemon) to detect, when phone gets locked
   - some trick
   - use Cocoa run loop for background app?
+- Add improved RFCOMM user-client
+  - use switch on RFCOMM control field in rfcomm.c packet handler
+- move RFCOMM code into BTdaemon
+- Provide BTstack Objective-C class
+- CocoaTouch 
+  - Warning and shutdown of Apple's stack
+- add timeouts to cocoa run loop
+- BUG: bt_close crashes when used in CocoaTouch app
+- BUG: BTdaemon crashes on iPhone when CocoaTouch app is closed (sometimes)
+
+== Release 0.2 - Incoming L2CAP supported + improved Inq Dialog
+
 - extend SpringBoard feedback
   - show alerts/messages using SpringBoardAcccess, e.g. Bluetooth disconnected by remote device
   - add code to notify about remote disconnets
@@ -32,9 +33,11 @@ NEXT:
   - error notification
   - flow control
   - reassembly/segmentation
+- add configure option for uart flowcontrol
+- create <btstack/errors.h>
 
 == Release Version 0.3
-- implement RFCOMM
+- implement RFCOMM server
 - implement SDP
 - implement PAN
 
diff --git a/src/socket_connection.c b/src/socket_connection.c
index 33a7d0d2e..6f3a4ecf3 100644
--- a/src/socket_connection.c
+++ b/src/socket_connection.c
@@ -73,7 +73,7 @@ typedef struct packet_header {
     uint16_t channel;
     uint16_t length;
     uint8_t  data[0];
-} packet_header_t;
+} packet_header_t;  // 6
 
 typedef enum {
     SOCKET_W4_HEADER,
@@ -86,7 +86,7 @@ struct connection {
     SOCKET_STATE state;
     uint16_t bytes_read;
     uint16_t bytes_to_read;
-    uint8_t  buffer[3+3+255]; // max HCI CMD + packet_header
+    uint8_t  buffer[360]; // packet_header(6) + max packet: DH5 = header(4) + payload (339)
 };
 
 /** list of socket connections */