diff --git a/TODO b/TODO
index 23ec0422..6c80403a 100644
--- a/TODO
+++ b/TODO
@@ -10,9 +10,8 @@ Most of the features already implemented for this release. The following is a li
 VERSION 1.4 TODO (Hash type)
 ============================
 
+* Blocking LPOP (BLPOP).
 * Hashes (HSET, HGET, HEXISTS, HLEN, ...).
-* Specially encoded memory-saving integer sets.
-* An utility able to export an .rdb file into a text-only JSON dump, we can't live anymore without such a tool. Probably an extension to redis-cli.
 * List ops like L/RPUSH L/RPOP should return the new list length.
 
 VERSION 1.6 TODO (Virtual memory)
@@ -42,13 +41,24 @@ VERSION 2.2 TODO (Optimizations and latency)
 
 * JSON command able to access data serialized in JSON format. For instance if I've a key foobar with a json object I can alter the "name" file using somthing like: "JSON SET foobar name Kevin". We should have GET and INCRBY as well.
 
+OTHER IMPORTANT THINGS THAT WILL BE ADDED BUT I'M NOT SURE WHEN
+===============================================================
+
+BIG ONES:
+
+* Specially encoded memory-saving integer sets.
+* A command to export a JSON dump (there should be mostly working patch needing major reworking).
+
+SMALL ONES:
+
+* Give errors when incrementing a key that does not look like an integer, when providing as a sorted set score something can't be parsed as a double, and so forth.
+
 SHORT/LONG TERM RANDOM TODO ITEMS
 =================================
 
 Most of this can be seen just as proposals, the fact they are in this list
 it's not a guarantee they'll ever get implemented ;)
 
-* Give errors when incrementing a key that does not look like an integer, when providing as a sorted set score something can't be parsed as a double, and so forth.
 * Move dict.c from hash table to skip list, in order to avoid the blocking resize operation needed for the hash table.
 * FORK command (fork()s executing the commands received by the current
   client in the new process). Hint: large SORTs can use more cores,
@@ -62,7 +72,7 @@ it's not a guarantee they'll ever get implemented ;)
 * zmalloc() should avoid to add a private header for archs where there is some other kind of libc-specific way to get the size of a malloced block. Already done for Mac OS X.
 * Read-only mode.
 * Pattern-matching replication.
-* Dont' safe empty lists / sets / zsets on disk with snapshotting.
+* Don't save empty lists / sets / zsets on disk with snapshotting.
 * Remove keys when a list / set / zset reaches length of 0.
 
 DOCUMENTATION WISHLIST
diff --git a/redis.conf b/redis.conf
index 72cba4ab..9bf1974b 100644
--- a/redis.conf
+++ b/redis.conf
@@ -64,9 +64,16 @@ databases 16
 # another Redis server. Note that the configuration is local to the slave
 # so for example it is possible to configure the slave to save the DB with a
 # different interval, or to listen to another port, and so on.
-
+#
 # slaveof <masterip> <masterport>
 
+# If the master is password protected (using the "requirepass" configuration
+# directive below) it is possible to tell the slave to authenticate before
+# starting the replication synchronization process, otherwise the master will
+# refuse the slave request.
+#
+# masterauth <master-password>
+
 ################################## SECURITY ###################################
 
 # Require clients to issue AUTH <PASSWORD> before processing any other
@@ -75,7 +82,7 @@ databases 16
 #
 # This should stay commented out for backward compatibility and because most
 # people do not need auth (e.g. they run their own servers).
-
+#
 # requirepass foobared
 
 ################################### LIMITS ####################################
@@ -85,7 +92,7 @@ databases 16
 # is able to open. The special value '0' means no limts.
 # Once the limit is reached Redis will close all the new connections sending
 # an error 'max number of clients reached'.
-
+#
 # maxclients 128
 
 # Don't use more memory than the specified amount of bytes.
@@ -104,7 +111,7 @@ databases 16
 # it is going to use too much memory in the long run, and you'll have the time
 # to upgrade. With maxmemory after the limit is reached you'll start to get
 # errors for write operations, and this may even lead to DB inconsistency.
-
+#
 # maxmemory <bytes>
 
 ############################## APPEND ONLY MODE ###############################