Added bracket tokens, updated tokenizer