Rebuild patches, improve factoids