Numerous updates.

Somehow got out of sync with master project. Hopefully this brings us up to date.