Made some more changes to ParseFacts

Should Compile