Added some things to TODO.