Improvement of Affiliate module & Resolutions of several bugs