working on google
Merge branch 'aaronQueryGoogle'
fixing google bugs