Fix matching of strings
Add matching character literals