Added a few comments, sligthly modified a test.
Updated the TODO.org list.