Fixed factoid management and improved config