updates to fix facts
fix fact gather order