fixed some todos