Several changes and additions.