Fix tokenizer and makefile