fixed bug with inline comments and integrated new tokenizer