more todo changes, in the middle of facs