some more TODOs

Minor changes adding some TODOs.