Various changes and additions.