fix string conversion
spelling correction
merge