Updated TODO (still so much to do !)