correction differents bugs