Grammar and Tokenizer adjustments