Updated some TODO notes.