More changes and stuff.