More changes

Too many to list :)