reverting back to google api and minor changes