Updates to the Program.

Merge this into your master branch to have the most recent version for testing.