merged
fixed spelling errors