Improve several things, and begin to test Affiliate Service, almost done