fixed some analytic event tracking