another few bugfixes, also eliminated several places where I was duplicating the fix logic.  Subjectively so far my connection feels substantially faster, remains to be seen if there are still issues, but so far so good