Multiple fixes ( i will make a list of all the features when it will be ready )