Updated todo and minute tweak. Valgrind and clang seem satisfied for the moment