Updated a lot of stuff... Especially Tokenizer