diff --git a/README.md b/README.md
index 0a1fe8f..78fdc71 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 SQLiteC++
 ---------
 
-SQLiteC++ (or SQLiteCpp) is a smart and easy to use C++ SQLite3 wrapper.
+SQLiteC++ (SQLiteCpp) is a smart and easy to use C++ SQLite3 wrapper.
 
 See SQLiteC++ website http://srombauts.github.com/SQLiteCpp on GitHub.
 
@@ -47,8 +47,8 @@ And following IDEs/Compilers
 
  - a STL implementation (even an old one, like those provided with VC6/eVC4 should work)
  - exception support (the class Exception inherit from std::runtime_error)
- - the SQLite library, either by linking to it dynamicaly or staticaly,
-   or by adding its source file in your project code base (source code provided in src/sqlite3).
+ - the SQLite library, either by linking to it dynamicaly or staticaly (libsqlite3-dev under Linux),
+   or by adding its source file in your project code base (source code provided in src/sqlite3 for Windows).
 
 To use it in your project, you only need to add the 10 SQLiteC++ source files
 in your project code base (not the main.cpp example file).
@@ -119,6 +119,7 @@ catch (std::exception& e)
 
 ## See also - Some other simple C++ SQLite wrappers:
 
+See also the file WRAPPERS.md offering a more complete comparison of other wrappers.
  - [sqdbcpp](http://code.google.com/p/sqdbcpp/): RAII design, simple, no depandencies, UTF-8/UTF-16, new BSD license
  - [sqlite3cc](http://ed.am/dev/sqlite3cc): uses boost, modern design, LPGPL
  - [sqlite3pp](http://code.google.com/p/sqlite3pp/): uses boost, but never updated since initial publication in may 2012, MIT License
diff --git a/TODO.txt b/TODO.txt
index 2be8ea1..3f1c83b 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,8 +1,12 @@
-C++11 explicit support
+Check C++11 explicit support
+
+Add a FAQ.txt
+Create Github Wiki pages with the README.md and FAQ.txt : Installation, Examples, 
 
-Update Doxygen Documentation, but remove it from the master branch
 Publish the Doxygen Documentation in the Github Pages (gh-pages branch)
 
+Add a full test suite
+
 Missing features in v0.5.0:
 - bind a SQLITE_STATIC value (string/blob)
 - bind a dynamic value with zerocopy (unlike SQLITE_TRANSIENT) with custom deleter
@@ -10,25 +14,17 @@ Missing features in v0.5.0:
 
 Missing documentation in v0.5.0:
 - This wrapper is not thread safe : compare to the thread safety of the SQLite3 library
+- explain the noncopyable property for RAII design
+- comment on returning error code instead of exception that shall not be thrown when exepected (!?)
 
 Advanced missing features:
 - backup support to/from file/:memory:
-- batch mode managing multiple queries semicolon separated ? 
 - Function ?
 - Agregate ?
 - support for different transaction mode ? NO: too specific
 - operator<< binding ? NO: redundant with bind()
 - ATTACH Database ? NO: can already be done by "ATTACH" Statement
-
-Add a full test suite
-
-Add optional usage of experimental sqlite3_trace() function to enable statistics 
-
-Add a comparison of others C++ wrappers (code style, C++ design, in code documentation, tests, online documentation, examples, license, UTF-16) 
+- Add optional usage of experimental sqlite3_trace() function to enable statistics 
 
 Post an article to CodeProject : Is there a license issue ?
 Mirror the repository to GoogleCode : with a versionned downloadable ZIP file
-
-Documentation:
-- explain the noncopyable property for RAII design
-- comment on returning error code instead of exception that shall not be thrown when exepected (!?)