I ran this all through - it should be working again. @jross -- do you think this will address what you were seeing? It's still a little flakey but gets the job done.