Use correct server
Match spec better
englishness