differents bugs resolved