Fixed the API and strings