grammar improvements
merge conflicts