diff --git a/TODO.txt b/TODO.txt
index a57a765a7..3cfbbfc42 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -16,6 +16,7 @@ E        [X] Links in Posted cannot be clicked.
 M        [ ] Fix the counting of unread messages in Posted. Now it's wrong.
 E        [X] Make the GUI of Posted more sexy: more compact items, remove unecessary text, use consistent icons,...
       
+      
        Forums
 E        [X] it's not possible to create a Forum thread without a Owner. 
              Bug? If not, then remove "No signature" from selection box
@@ -25,7 +26,7 @@ E        [X] it's not possible to create a Forum thread without a Owner.
       
        GUI General
 E        [ ] do we keep "Getting Started" ? the look needs to be improved
-E        [ ] Recommendation messages do not show complete links. Links show up in some buttons and the text is truncated
+E        [X] Recommendation messages do not show complete links. Links show up in some buttons and the text is truncated
 E        [X] Recommendation messages should not be signed by the retroshare team!!
 E        [X] when adding a friend through clicking on cert links, the add friend wizard is shown twice!
 M        [X] add a flag in friends option to allow auto-download of recommended files
@@ -55,6 +56,9 @@ H        [X] marking all as read in channels takes time. The channel icon should
              during the operation to avoid the user to re-click many times in the hope to get the posts marked as read.
          [X] channels items show a 0 left to the up/Dn buttons. What is it??
          [X] allow to post on channels when attachment is not in shared files. Just display a warning.
+M			[ ] popularity calculation seems wrong. To reproduce: create a new channel and subscribe to it from 
+			    another location with many friends => popularity is too big at that location (should be 1)
+
       
        Chat lobbies
 H        [X] Chat lobbies should use Identities. That's a significant change, probably not backward compatible. 
@@ -66,7 +70,7 @@ H        [ ] Distant chat should work with shared identities
          [X] Distant chat fails (tunnel bullet never gets green) when re-openning a distant chat window after closing a tunnel
          [X] Distant chat fails (chat window never appears) when re-openning a distant chat window after closing a tunnel
          [X] You should not be enabled to distant-chat yourself!
-         [ ] Nickname completion is broken. It only works with @
+         [X] Nickname completion is broken. It only works with @
       
        Identities:
          [X] "Owned by you" => "Owned by node [nodename]" 
@@ -78,10 +82,10 @@ M        [ ] allow to share identities between locations.
       
        Network
 E        [ ] Friends => Friend nodes
-E        [ ] remove TCP, TOR, UDP from the status column, and move it in front of IP
+E        [X] remove TCP, TOR, UDP from the status column, and move it in front of IP
       
        File transfer
-H        [ ] There's a bug sometimes causing re-hash of shared files at start. Find it and kill it.
+H        [ ] There's a bug sometimes causing re-hash of shared files at start. Find it, kill it.
 
        News feed
          [X] remove the Ghost news feed items
@@ -93,7 +97,7 @@ H        [ ] valgrind pass for data races
 H        [ ] valgrind pass for memory leaks 
 H        [ ] valgrind pass for memory errors 
 H        [ ] valgrind pass for performance
-E        [ ] remove mktemp => use mkstemp
+E        [-] remove mktemp => use mkstemp
              note: mkstemp is not available on Windows
 H        [ ] RsGxsDataAccess::processRequests locks mDataMutex until all requests are processed.
              Adding a new request or poll for the request status are freezing until the mutex is available.