+ Adapted some functions for th normalization, the code is not over, will need some tests
! Some merge fixes