Grammar fixes and language tweaks