Corrects some lexing issues. It appeared to be trying to match far too
much stuff to be useful to any consequent parser.
Corrects the string case, and adds a basic test for it.