Several minor, but important, changes