manually merged all final versions so far and works well
finalised debugging noticed this morning (sorry)