Add some more TODOs and a minor fix.