work, more todo changes, still on facs, finished some at the end