Add substitufion fonction for NF, fix some mistakes in the datatype.