Fixed analytics tracking, and updated event schedule