Add some more TODOs and fix a typo.