finished adding tracking stuff
fixed analytics