
Rewrite code to eliminate the use of PROG, etc. General code cleanup.

