Several changes throughout.