optional _ in keywords and better string highlighting

optional underscores in FISH keywords
Correct highlighting of strings
Added some missing functions