add Google and fixes