grammar fixes
merge dev