Fixed tokenizer; Expand CR rules