Some linguistic improvements