Affiliate offers and separate connections

done, and fixed in 32 too.