Did further cleaning, re-organization, and a lot of renaming to improve accuracy and simplicity of program flow.  More to do...