resolve some todos