Fixed tokenizer to work with quoted content and verbatim content better, also added comment tag.