More changes and shit