fix up animal farms, optimize others