changed some todos