fixed spelling errors
merge, conflicts fixed