fix some bugs ma gueule