finished some todos