updated entry lexer and parser