V36 Overhaul

I am restoring an archived program and changes were not well documented
in earlier versions.