More changes. Minor ones so far.