fixed tracking and analytics