Corrections + améliorations