Improved performance CPU fitting

Much (much!) faster fitting on the CPU