Remove todo comments that have been fixed, add two more todos.