General changes and additions.