Several changes and additions