TODO list fixed.