adding in state fact sources, and other little changes