Some updated TODO docs.