added some todos

some minor fixes