Removed fixed todos, added new ones.