Updated TODO file.
Changed code to silence some warnings from gcc.