Some grammar fixes and minor improvements