fixed tokenizer, expect a code cleanup soon