minor fixes
added some todos