fixing bugs and getting affiliates ready for live test