Second patch of updates.
16 files changed