added analytic tracking to spotlights
cleanup