edited some todos