Still MORE cleaning, re-organization, and refactoring to improve accuracy and simplicity of program flow.  Put flock vs. not flock decision making in a module (to 'hide it').  More to do...