Lots of proxy data fixes

On to analysis after this.  But, I've made a number of changes here to bringing in proxy data properly based on emails from the last few days.  Next up, analysis!