added most of the things, only remains mix selection, numbers are coherent with last tps ecm (+- 0.01 is ok for N = 400)