Added some more stuff and commented GoogleAnalytics