fixed more lexer logic
more parser tests are now passing