changed google analytics integration, small fixes/improvements