some more TODOs
deal with the leftovers too