Third round of updates.
18 files changed