some todos fixed