fix issues - header and tokenizer is working