Changed Lexer and other thing (TM)