More changes

and Stuff