fix some todos