Some lexer fixes. Parse basic strings.
Fixes to lexer and parser. Now the specs pass as before.