Added a few small things/fixes to the token/tokenizer