diff --git a/TODO b/TODO
index 0555c8ae3..cc83cea75 100644
--- a/TODO
+++ b/TODO
@@ -2,33 +2,7 @@
 =====
 merge emqttc code...
 
-
-0.2.2
-=====
-
-merge pull request#26
-
-0.2.0
-=====
-
-1. project structure...
-2. apps, deps, plugins,
-3. rel...
-4. mochiweb: http publish...
-5 cluster...
-6. support MQTT3.1.1...
-7. python, java test code
-8. emqtt_cm to manager clientId, clientPid...
-
-
-????
-    {ok, {{simple_one_for_one_terminate, 0, 1},
-          [{client, {emqtt_client, start_link, []}, 
-				temporary, 5000, worker, [emqtt_client]}]}}.
-
-fucking stupid..... esockd locked
-
-0.2.1
+0.6.0
 =====
 
 one million connections test...
@@ -41,3 +15,23 @@ full test cases...
 
 spawn_link to replace 'spawn' and 'link'
 
+=======
+## ACL
+
+## Authentication with clientId
+
+## SSL/TLS Socket
+
+## $SYS/topics and Broker statistics...
+
+## Cluster 
+
+## Bridge
+
+## Websocket
+
+## MQTT over Websocket
+
+## Mnesia 
+
+Create Schema...
diff --git a/apps/emqtt/src/emqtt_net.erl b/apps/emqtt/src/emqtt_net.erl
index 21d98d704..735e5c550 100644
--- a/apps/emqtt/src/emqtt_net.erl
+++ b/apps/emqtt/src/emqtt_net.erl
@@ -194,7 +194,7 @@ getopts(Sock, Options) when is_port(Sock) ->
 setopts(Sock, Options) when is_port(Sock) ->
     inet:setopts(Sock, Options).
 
-sockname(Sock)   when is_port(Sock) -> inet:sockname(Sock).
+sockname(Sock) when is_port(Sock) -> inet:sockname(Sock).
 
 peer_string(Sock) ->
     case peername(Sock) of
diff --git a/doc/design.md b/doc/design.md
index 9e775a095..b23963c51 100644
--- a/doc/design.md
+++ b/doc/design.md
@@ -22,9 +22,16 @@ Router to register queues
 
 ## Topic Tree
 
+## Offline Message
+
+## ACL
+
+## Authentication with clientId
+
+## SSL/TLS Socket
+
+## $SYS/topics and Broker statistics...
+
 ## Cluster 
 
 ## Bridge
-
-## Offline Message
-