Jim changes and updates.

Placing Jim's main changes from his branch onto the organization's
master.