Update TODO and Plans