Got comment and herecomment tokens working