Fix typo
Properly track subs and links
Working hot and new for subs