Google analytics + minor changes