google analytics, reformal and small fixes