Mike's Approved Changes

Inclusive of some of Pete's changes and some reversion back to the
original.