More changes and fiddling