Some fixes, factorisation..