Better debug, and using the new AFFID and click tracking code.