Updated lex file
adjusting some definitions