diff --git a/TODO.txt b/TODO.txt
index 71348e87e..90720b966 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,19 +1,26 @@
 /* new todo file for BTstack */
 
 UNTIL 13. August 2009 : Google Open Source Jam
-- implement L2CAP state machine
-  - outgoing for now only
+- implement L2CAP state machine (outgoing only) - take care for matching channels with signaling packets better
+  - test sig_id for incoming responses - 
+  - test channel id for incoming requests (
 - decide on naming conventions for various layers
 - decide where L2CAP state machine belongs
 - decide on l2CAP event/data interface
-  - client does not need to send raw ACL packets
+  - client only sends L2CAP packets (or higher) - no need to send/receive raw ACL packets
 - provide demos:
   - BT Scanner: module info, inquiry, remote name
   - Terminal app with L2CAP support - Python or Java PC demo
+	- implement l2cap_send_packet
+    - readline? own command line support?
   - evtl. SDP browser
   - evtl. RFCOMM to BT GPS
   
 NEXT:
+- implement rest of L2CAP state machine
+  - incoming
+  - error handling
+  - error notification
 - client/server part using unix domain sockets (portable and fast)
 - implement RFCOMM
 - implement
diff --git a/example/test.c b/example/test.c
index 674d4b12e..f92e91a2b 100644
--- a/example/test.c
+++ b/example/test.c
@@ -13,7 +13,8 @@
 #include "../src/run_loop.h"
 #include "../src/hci.h"
 
-bd_addr_t addr = {0x00, 0x03, 0xc9, 0x3d, 0x77, 0x43 };  // Think Outside Keyboard
+// bd_addr_t addr = {0x00, 0x03, 0xc9, 0x3d, 0x77, 0x43 };  // Think Outside Keyboard
+bd_addr_t addr = {0x00, 0x19, 0x1d, 0x90, 0x44, 0x68 };  // WiiMote
 
 void acl_handler(uint8_t *packet, uint16_t size){
 	// just dump data for now
@@ -29,7 +30,7 @@ void event_handler(uint8_t *packet, uint16_t size){
     
 	// use pairing
     if ( COMMAND_COMPLETE_EVENT(packet, hci_write_local_name) ) {
-        bt_send_cmd(&hci_write_authentication_enable, 1);
+        bt_send_cmd(&hci_write_authentication_enable, 0);
     }
 	
 	// connect to HID device (PSM 0x13) at addr
diff --git a/src/daemon.c b/src/daemon.c
index 32112c10e..1608eda59 100644
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -89,11 +89,7 @@ int main (int argc, const char * argv[]){
     //
     hci_register_event_packet_handler(&socket_connection_send_event_all);
     hci_register_acl_packet_handler(&socket_connection_send_acl_all);
-    
-    // @TODO allow control per HCI CMD
-    // turn on 
-    // hci_power_control(HCI_POWER_ON);
-    
+        
     // @TODO make choice of socket server configurable (TCP and/or Unix Domain Socket)
     // @TODO make port and/or socket configurable per config.h