Move analytics to an include.
Fix typos.