Fix cluster recalc, Fix import speed.