Some changes and additions.