added tokenizer and made edits to some stuff