the test to disable the possible state in a comment was not at the good place
Merge branch 'comment-fix'
strings collection moved with the other string variables
comment fixes
$ can be part of a token
else removed to include \ in strings
Merge branch 'fixes'