better lexer and improvement in code "reading"