fixed a lot spec, factoriy WHATEVER issues...