Fixing TODO list.