Some syntax and grammatical changes