Adding Google validation
Bug fixes.