Added analytics
Tweaked some stuff