Add tracking URL handling.
Minor fixes.