diff --git a/TODO.md b/TODO.md
index 1ff3463..2bef3a9 100644
--- a/TODO.md
+++ b/TODO.md
@@ -12,6 +12,7 @@
 - explanations and static content in general should be written using some kind of templates, not directly in Halogen
 - admin interface: enable administrators to ask for users' info and show zones
 - admin interface: perform a few more administrative operations (*TBD*)
+- allow '*' in record names
 
 # Tests
 
@@ -23,8 +24,7 @@
 - user interface: display the email address
 - somewhat better looking welcome page
 - somewhat better looking explanation pages
-- hide logs by default
-- show a big button on disconnection
+- hide logs by default?
 - *maybe* notifications should disappear after a few seconds
 - admin interface: basically just rewrite the whole thing, it's a mess
 
@@ -32,12 +32,12 @@
 
 The code should be reviewed and a decent documentation should be provided.
 
-Right now, the code is still in a somewhat early stage and multiple refactoring should take place.
+Right now, the code is still in a somewhat early stage and **multiple** refactoring should take place.
 For example, modules have a very generic API; they can provide or receive messages from (respectively *to*) authd or dnsmanagerd.
 Instead, modules should have a more specific API and not deal with message encoding at all.
 Furthermore, *maybe* the state of the entire application should be stored in a single module, with a single function handling all state modifications when a message is received, enabling a simpler data management.
 
 # TODO in authd and dnsmanagerd
 
-- disconnect users when they didn't ask for anything in several minutes
+- enable users to change their NS (but show a **BIG warning** before that)
 - MIGRATION-related: remove migrated accounts with no connection in over 6 months