Updated TODO list entries with further improvement plans