updated todo and a few other things