google analytics setup modification and small fixies