mostly new stuff, plus affiliate bridge fix