More big name re-orgs, including standardizing uniform and attribute names.  More error handling in prog setup.