update TODO w/ some more issue numbers