some todos done, some new ones