a few more TODOs