a few minor fixes and removing google+ stuff.