fix String-related issues and typos