added google analytics & various fixes