Fix matching character literals
Improve comments