Minor changes ( correct normalisation, etc... )