More changes and things!