Friend functions that did not need to be friend moved outside the class (to solve Xcode problem with default arguments in friend functions).
Harmonization of the parameters of some contractors.