Bugfix: tokenizer now reverts tokens between graves