solved some todos