fixing lr
fixing lexical analysis
fixing more lex