few minor changes, fixed Tokenizer (piazza)