Updated some stuff
More changes