Several minor changes and additions.