Add tracking & fix typo