Fix a lot of issue for the hurry of the update :p dont pay atention to the previous commit :p