Multiple code changes and additions.