More language tweaking