Add google_plus.json and various code fixes