fix lexer and add option value