Minor fixes/additions in logic and fact-generator.