More changes and stuff