update TODO file and added reinaldo's modifications